Left: | ||
Right: |
OLD | NEW |
---|---|
1 class web::server( | 1 class web::server( |
2 $vhost, | 2 $vhost, |
3 $repository, | 3 $repository, |
4 $certificate = hiera('web::server::certificate', 'undef'), | 4 $certificate = hiera('web::server::certificate', 'undef'), |
5 $private_key = hiera('web::server::private_key', 'undef'), | 5 $private_key = hiera('web::server::private_key', 'undef'), |
6 $is_default = false, | 6 $is_default = false, |
7 $aliases = undef, | 7 $aliases = undef, |
8 $custom_config = undef, | 8 $custom_config = undef, |
9 $multiplexer_locations = undef, | 9 $multiplexer_locations = undef, |
10 $geoip = false, | 10 $geoip = false, |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
87 user => www, | 87 user => www, |
88 timeout => 0, | 88 timeout => 0, |
89 onlyif => "test ! -d /home/www/${repository}", | 89 onlyif => "test ! -d /home/www/${repository}", |
90 } | 90 } |
91 | 91 |
92 file {'/var/www': | 92 file {'/var/www': |
93 ensure => directory, | 93 ensure => directory, |
94 mode => 755, | 94 mode => 755, |
95 } | 95 } |
96 | 96 |
97 file {"/var/www/${vhost}": | 97 file {[ |
98 "/var/cache/${repository}", | |
99 "/var/www/${vhost}", | |
Fred
2015/10/12 13:07:48
Are the variables $repository and $vhost guarantee
mathias
2015/10/12 13:18:36
Neither by code, nor by documentation. By conventi
| |
100 ]: | |
98 ensure => directory, | 101 ensure => directory, |
99 owner => www, | 102 owner => www, |
100 mode => 755, | 103 mode => 755, |
101 } | 104 } |
102 | 105 |
103 cron {'update_cms': | 106 cron {'update_cms': |
104 ensure => present, | 107 ensure => present, |
105 command => "hg pull -q -u -R /opt/cms", | 108 command => "hg pull -q -u -R /opt/cms", |
106 minute => '5-55/10', | 109 minute => '5-55/10', |
107 } | 110 } |
108 | 111 |
109 cron {'update_repo': | 112 cron {'update_repo': |
110 ensure => present, | 113 ensure => present, |
111 command => "hg pull -q -R /home/www/${repository} && python -m cms.bin.gener ate_static_pages /home/www/${repository} /var/www/${vhost}", | 114 command => "hg pull -q -R /home/www/${repository} && python -m cms.bin.gener ate_static_pages /home/www/${repository} /var/www/${vhost}", |
112 user => www, | 115 user => www, |
113 minute => '*/10', | 116 minute => '*/10', |
114 } | 117 } |
115 } | 118 } |
OLD | NEW |