summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2017-08-26 22:41:25 +0200
committerJan Dittberner <jandd@cacert.org>2017-08-26 22:41:25 +0200
commit5486fef412204b6f61b750cd9a3886a69884de20 (patch)
treea8a4c293eb67d7a60d0d3f61cfc0a4c98b0330a3
parentbaf18bec4a16094152c6c935faccb89e6de65ccf (diff)
downloadcacert-puppet-5486fef412204b6f61b750cd9a3886a69884de20.tar.gz
cacert-puppet-5486fef412204b6f61b750cd9a3886a69884de20.tar.xz
cacert-puppet-5486fef412204b6f61b750cd9a3886a69884de20.zip
Define nginx config before package installation to avoid port conflict
-rw-r--r--sitemodules/profiles/manifests/sniproxy.pp24
1 files changed, 15 insertions, 9 deletions
diff --git a/sitemodules/profiles/manifests/sniproxy.pp b/sitemodules/profiles/manifests/sniproxy.pp
index 4a19ebd..1453c3f 100644
--- a/sitemodules/profiles/manifests/sniproxy.pp
+++ b/sitemodules/profiles/manifests/sniproxy.pp
@@ -77,18 +77,24 @@ class profiles::sniproxy (
subscribe => [File['/etc/default/sniproxy'], File['/etc/sniproxy.conf']],
}
- package { 'nginx-light':
- ensure => present,
+ file { '/etc/nginx':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
} ->
file { '/etc/nginx/nginx.conf':
- ensure => file,
- owner => 'root',
- group => 'root',
- mode => '0644',
- source => 'puppet:///modules/profiles/sniproxy/nginx.conf',
+ ensure => file,
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ source => 'puppet:///modules/profiles/sniproxy/nginx.conf',
+ } ->
+ package { 'nginx-light':
+ ensure => present,
} ->
service { 'nginx':
- ensure => running,
- enable => true,
+ ensure => running,
+ enable => true,
}
}