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 | 7 |
8 include adblockplus::abpssembly | 8 include adblockplus::abpssembly |
9 include adblockplus::web | 9 include adblockplus::web |
10 | 10 |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 | 88 |
89 fetch_repository {$repositories_to_sync: } | 89 fetch_repository {$repositories_to_sync: } |
90 | 90 |
91 $update_update_manifests_script = '/usr/local/bin/update_update_manifests' | 91 $update_update_manifests_script = '/usr/local/bin/update_update_manifests' |
92 | 92 |
93 file {$update_update_manifests_script: | 93 file {$update_update_manifests_script: |
94 mode => '0755', | 94 mode => '0755', |
95 content => template('updateserver/update_update_manifests.erb') | 95 content => template('updateserver/update_update_manifests.erb') |
96 } | 96 } |
97 | 97 |
98 ensure_packages(['python-pip', 'python-dev']) | |
99 | |
100 # Make sure that apt packages corresponding to the pip-installed modules below | 98 # Make sure that apt packages corresponding to the pip-installed modules below |
101 # won't be installed unintentionally, these will take precedence otherwise. | 99 # won't be installed unintentionally, these will take precedence otherwise. |
102 package {['python-jinja2', 'python-crypto']: | 100 package {['python-jinja2', 'python-crypto']: |
103 ensure => 'held', | 101 ensure => 'held', |
104 } | 102 } |
105 | 103 |
106 package {'Jinja2': | 104 package {'Jinja2': |
107 ensure => '2.8', | 105 ensure => '2.8', |
108 provider => 'pip', | 106 provider => 'pip', |
109 require => [Package['python-pip'], Package['python-jinja2']], | 107 require => [Package['python-pip'], Package['python-jinja2']], |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', | 139 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', |
142 socket => '/tmp/multiplexer-fastcgi.sock', | 140 socket => '/tmp/multiplexer-fastcgi.sock', |
143 mode => '0666', | 141 mode => '0666', |
144 user => 'nginx', | 142 user => 'nginx', |
145 children => 1, | 143 children => 1, |
146 require => [ | 144 require => [ |
147 Class["sitescripts"], | 145 Class["sitescripts"], |
148 ], | 146 ], |
149 } | 147 } |
150 } | 148 } |
OLD | NEW |