diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-30 18:07:45 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-30 18:07:45 +0200 |
commit | 54460a893b4266d88fe23eb114a5b4e8a5b79077 (patch) | |
tree | 1493379a20cac50f4a0ef703db2e4fbdbca6ac58 /modules/profile/manifests | |
parent | 3c1e202cf136cb7fae2860d7608cc1d077953d0b (diff) | |
parent | 77d4b0b7672ee0a840fb721463964c7edf0eb044 (diff) | |
download | Puppet-54460a893b4266d88fe23eb114a5b4e8a5b79077.tar.gz Puppet-54460a893b4266d88fe23eb114a5b4e8a5b79077.tar.zst Puppet-54460a893b4266d88fe23eb114a5b4e8a5b79077.zip |
Merge branch 'dev'
Diffstat (limited to 'modules/profile/manifests')
-rw-r--r-- | modules/profile/manifests/apache.pp | 2 | ||||
-rw-r--r-- | modules/profile/manifests/redis.pp | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/modules/profile/manifests/apache.pp b/modules/profile/manifests/apache.pp index 382633b..7187350 100644 --- a/modules/profile/manifests/apache.pp +++ b/modules/profile/manifests/apache.pp | |||
@@ -4,6 +4,8 @@ class profile::apache { | |||
4 | root_directory_options => ["All"], | 4 | root_directory_options => ["All"], |
5 | default_mods => false, | 5 | default_mods => false, |
6 | default_vhost => false, | 6 | default_vhost => false, |
7 | user => "http", | ||
8 | group => "http", | ||
7 | log_formats => { | 9 | log_formats => { |
8 | combined => '%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %p', | 10 | combined => '%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %p', |
9 | common => '%h %l %u %t \"%r\" %>s %b', | 11 | common => '%h %l %u %t \"%r\" %>s %b', |
diff --git a/modules/profile/manifests/redis.pp b/modules/profile/manifests/redis.pp index 79871b1..d912c59 100644 --- a/modules/profile/manifests/redis.pp +++ b/modules/profile/manifests/redis.pp | |||
@@ -17,9 +17,8 @@ class profile::redis { | |||
17 | notify => Service["redis"], | 17 | notify => Service["redis"], |
18 | } | 18 | } |
19 | 19 | ||
20 | package { "ruby-augeas": | 20 | ensure_packages(["ruby-augeas"]) |
21 | ensure => installed, | 21 | |
22 | } -> | ||
23 | class { '::redis': | 22 | class { '::redis': |
24 | unixsocket => "/run/redis/redis.sock", | 23 | unixsocket => "/run/redis/redis.sock", |
25 | unixsocketperm => "777", | 24 | unixsocketperm => "777", |
@@ -28,7 +27,10 @@ class profile::redis { | |||
28 | config_file => "/etc/redis.conf", | 27 | config_file => "/etc/redis.conf", |
29 | config_file_orig => "/etc/redis.conf.puppet", | 28 | config_file_orig => "/etc/redis.conf.puppet", |
30 | port => 0, | 29 | port => 0, |
31 | require => File["/etc/systemd/system/redis.service.d/socket_shutdown.conf"], | 30 | require => [ |
31 | File["/etc/systemd/system/redis.service.d/socket_shutdown.conf"], | ||
32 | Package["ruby-augeas"] | ||
33 | ] | ||
32 | } | 34 | } |
33 | 35 | ||
34 | } | 36 | } |