Side by Side Diff: modules/filterserver/manifests/init.pp
Issue 29327575:
Issue 3062 - Explicitly ensure user "nginx" is present (Closed)
Patch Set: Issue 3062 - Now without accidental inclusion of trac.ini.erb
Created Sept. 12, 2015, 1:13 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
modules/nginx/manifests/init.pp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 class filterserver($is_default = false) { | 1 class filterserver($is_default = false) { |
| 2 if !defined(Class['nginx']) { | 2 if !defined(Class['nginx']) { |
| 3 class {'nginx': | 3 class {'nginx': |
| 4 worker_connections => 4000, | 4 worker_connections => 4000, |
| 5 ssl_session_cache => off, | 5 ssl_session_cache => off, |
| 6 } | 6 } |
| 7 } | 7 } |
| 8 | 8 |
| 9 if !defined(File['/var/www']) { | 9 if !defined(File['/var/www']) { |
| 10 file {'/var/www': | 10 file {'/var/www': |
| 11 ensure => directory, | 11 ensure => directory, |
| 12 owner => nginx, | 12 owner => nginx, |
| 13 mode => 0755, | 13 mode => 0755, |
| 14 require => Package['nginx'] | 14 require => User['nginx'] |
| 15 } | 15 } |
| 16 } | 16 } |
| 17 | 17 |
| 18 user {'subscriptionstat': | 18 user {'subscriptionstat': |
| 19 ensure => absent, | 19 ensure => absent, |
| 20 } | 20 } |
| 21 | 21 |
| 22 user {'rsync': | 22 user {'rsync': |
| 23 ensure => present, | 23 ensure => present, |
| 24 comment => 'Filter list mirror user', | 24 comment => 'Filter list mirror user', |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 File['/home/rsync/.ssh/id_rsa'], | 99 File['/home/rsync/.ssh/id_rsa'], |
| 100 User['rsync'] | 100 User['rsync'] |
| 101 ], | 101 ], |
| 102 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas ter.adblockplus.org:. /var/www/easylist/', | 102 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas ter.adblockplus.org:. /var/www/easylist/', |
| 103 environment => ['MAILTO=admins@adblockplus.org,root'], | 103 environment => ['MAILTO=admins@adblockplus.org,root'], |
| 104 user => rsync, | 104 user => rsync, |
| 105 hour => '*', | 105 hour => '*', |
| 106 minute => '2-52/10' | 106 minute => '2-52/10' |
| 107 } | 107 } |
| 108 } | 108 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
modules/nginx/manifests/init.pp » ('j')
|
no next file with comments »
