Side by Side Diff: modules/updateserver/manifests/init.pp
Issue 29469642:
#1634 - Update file resource syntax in module updateserver (Closed)
Patch Set:
Created June 20, 2017, 5:15 p.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
|
no next file »
|
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 updateserver( | 1 class updateserver( |
| 2 $domain, | 2 $domain, |
| 3 $certificate, | 3 $certificate, |
| 4 $private_key, | 4 $private_key, |
| 5 $is_default=false | 5 $is_default=false |
| 6 ) { | 6 ) { |
| 7 class {'nginx': | 7 class {'nginx': |
| 8 worker_connections => 4000, | 8 worker_connections => 4000, |
| 9 ssl_session_cache => off, | 9 ssl_session_cache => off, |
| 10 } | 10 } |
| 11 | 11 |
| 12 File { | 12 File { |
| 13 owner => root, | 13 owner => root, |
| 14 group => root | 14 group => root |
| 15 } | 15 } |
| 16 | 16 |
| 17 file {'/var/www': | 17 file {'/var/www': |
| 18 ensure => directory, | 18 ensure => directory, |
| 19 mode => 0755, | 19 mode => '0755', |
| 20 require => Package['nginx'] | 20 require => Package['nginx'] |
| 21 } | 21 } |
| 22 | 22 |
| 23 $update_dir = '/var/www/update' | 23 $update_dir = '/var/www/update' |
| 24 | 24 |
| 25 file {$update_dir: | 25 file {$update_dir: |
| 26 ensure => directory, | 26 ensure => directory, |
| 27 mode => 0755 | 27 mode => '0755' |
| 28 } | 28 } |
| 29 | 29 |
| 30 $sitescripts_var_dir = '/var/lib/sitescripts' | 30 $sitescripts_var_dir = '/var/lib/sitescripts' |
| 31 | 31 |
| 32 user {'sitescripts': | 32 user {'sitescripts': |
| 33 ensure => present, | 33 ensure => present, |
| 34 home => $sitescripts_var_dir | 34 home => $sitescripts_var_dir |
| 35 } | 35 } |
| 36 | 36 |
| 37 file {$sitescripts_var_dir: | 37 file {$sitescripts_var_dir: |
| 38 ensure => directory, | 38 ensure => directory, |
| 39 mode => 0755, | 39 mode => '0755', |
| 40 owner => 'sitescripts', | 40 owner => 'sitescripts', |
| 41 group => 'sitescripts' | 41 group => 'sitescripts' |
| 42 } | 42 } |
| 43 | 43 |
| 44 $update_manifest_dirs = ["${update_dir}/gecko", | 44 $update_manifest_dirs = ["${update_dir}/gecko", |
| 45 "${update_dir}/adblockplusandroid", | 45 "${update_dir}/adblockplusandroid", |
| 46 "${update_dir}/adblockplusie", | 46 "${update_dir}/adblockplusie", |
| 47 "${update_dir}/adblockplussafari"] | 47 "${update_dir}/adblockplussafari"] |
| 48 | 48 |
| 49 file {$update_manifest_dirs: | 49 file {$update_manifest_dirs: |
| 50 ensure => directory, | 50 ensure => directory, |
| 51 mode => 0755, | 51 mode => '0755', |
| 52 owner => 'sitescripts', | 52 owner => 'sitescripts', |
| 53 group => 'sitescripts' | 53 group => 'sitescripts' |
| 54 } | 54 } |
| 55 | 55 |
| 56 nginx::hostconfig{$domain: | 56 nginx::hostconfig{$domain: |
| 57 source => 'puppet:///modules/updateserver/site.conf', | 57 source => 'puppet:///modules/updateserver/site.conf', |
| 58 is_default => $is_default, | 58 is_default => $is_default, |
| 59 certificate => $certificate, | 59 certificate => $certificate, |
| 60 private_key => $private_key, | 60 private_key => $private_key, |
| 61 log => 'access_log_update' | 61 log => 'access_log_update' |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', | 143 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', |
| 144 socket => '/tmp/multiplexer-fastcgi.sock', | 144 socket => '/tmp/multiplexer-fastcgi.sock', |
| 145 mode => '0666', | 145 mode => '0666', |
| 146 user => 'nginx', | 146 user => 'nginx', |
| 147 children => 1, | 147 children => 1, |
| 148 require => [ | 148 require => [ |
| 149 Class["sitescripts"], | 149 Class["sitescripts"], |
| 150 ], | 150 ], |
| 151 } | 151 } |
| 152 } | 152 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
