LEFT | RIGHT |
1 node 'issues1' { | 1 node 'issues1' { |
2 | 2 |
3 include base, private::trac | 3 include base, private::trac |
4 | 4 |
5 class {'trac': | 5 class {'trac': |
6 domain => 'issues.adblockplus.org', | 6 domain => 'issues.adblockplus.org', |
7 certificate => 'issues.adblockplus.org_sslcert.pem', | 7 certificate => 'issues.adblockplus.org_sslcert.pem', |
8 private_key => 'issues.adblockplus.org_sslcert.key', | 8 private_key => 'issues.adblockplus.org_sslcert.key', |
9 is_default => true, | 9 is_default => true, |
10 } | 10 } |
(...skipping 15 matching lines...) Expand all Loading... |
26 database => 'trac_orders', | 26 database => 'trac_orders', |
27 permissions => "puppet:///modules/trac/order-permissions.csv", | 27 permissions => "puppet:///modules/trac/order-permissions.csv", |
28 } | 28 } |
29 | 29 |
30 # Transforming the auth_cookie table of the "new" Trac project into an | 30 # Transforming the auth_cookie table of the "new" Trac project into an |
31 # insertable view for the "old" project's table of the same name avoids | 31 # insertable view for the "old" project's table of the same name avoids |
32 # the need to convert the entire auth to htpasswd-file handling, which | 32 # the need to convert the entire auth to htpasswd-file handling, which |
33 # would be the official way to go for achieving a shared authentication. | 33 # would be the official way to go for achieving a shared authentication. |
34 exec { 'trac_auth_cookie_view': | 34 exec { 'trac_auth_cookie_view': |
35 command => "mysql -utrac -p'${private::trac::database_password}' trac_orders
--execute ' | 35 command => "mysql -utrac -p'${private::trac::database_password}' trac_orders
--execute ' |
36 CREATE VIEW auth_cookie_view AS SELECT * FROM trac.auth_cookie; | 36 DROP TABLE IF EXISTS auth_cookie; |
37 RENAME TABLE auth_cookie TO auth_cookie_original, auth_cookie_view TO auth
_cookie;'", | 37 CREATE VIEW auth_cookie AS SELECT * FROM trac.auth_cookie;'", |
38 unless => "mysql -utrac -p'${private::trac::database_password}' trac_orders
--execute ' | 38 unless => "mysql -utrac -p'${private::trac::database_password}' trac_orders
--execute ' |
39 SHOW CREATE VIEW auth_cookie'", | 39 SHOW CREATE VIEW auth_cookie'", |
40 path => "/usr/bin:/usr/sbin:/bin:/usr/local/bin", | 40 path => "/usr/bin:/usr/sbin:/bin:/usr/local/bin", |
41 require => [ | 41 require => [ |
42 Exec["deploy_issues"], | 42 Exec["deploy_issues"], |
43 Exec["deploy_orders"], | 43 Exec["deploy_orders"], |
44 ], | 44 ], |
45 } | 45 } |
46 | 46 |
47 # Synchronizing e-mail and password information between the project | 47 # Synchronizing e-mail and password information between the project |
(...skipping 24 matching lines...) Expand all Loading... |
72 | 72 |
73 # Unfortunately, the spawn-fcgi module is not capable of stopping the | 73 # Unfortunately, the spawn-fcgi module is not capable of stopping the |
74 # processes of pools that are changed to absent - simply because it removes | 74 # processes of pools that are changed to absent - simply because it removes |
75 # the configuration file and the subsequent reload or restart does not | 75 # the configuration file and the subsequent reload or restart does not |
76 # recognize the pool any more. Thus, we have to ensure that the service is | 76 # recognize the pool any more. Thus, we have to ensure that the service is |
77 # stopped before: | 77 # stopped before: |
78 exec { 'tracd_kludge': | 78 exec { 'tracd_kludge': |
79 command => 'service spawn-fcgi stop', | 79 command => 'service spawn-fcgi stop', |
80 onlyif => 'service spawn-fcgi status', | 80 onlyif => 'service spawn-fcgi status', |
81 path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', | 81 path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', |
| 82 notify => Service['spawn-fcgi'], |
82 } | 83 } |
83 | 84 |
84 # Pretty similar to the "tracd" pool issue above: The trac-admin initenv | 85 # Pretty similar to the "tracd" pool issue above: The trac-admin initenv |
85 # command would fail for environment-issues after creation of the directory | 86 # command would fail for environment-issues after creation of the directory |
86 # structure, when it comes to the database setup (which already exists), | 87 # structure, when it comes to the database setup (which already exists), |
87 # if we do not handle the existing resources manually.. | 88 # if we do not handle the existing resources manually.. |
88 exec { 'trac_env_issues_kludge': | 89 exec { 'trac_env_issues_kludge': |
89 command => 'ln -s environment /home/trac/environment-issues', | 90 command => 'ln -s environment /home/trac/environment-issues', |
90 before => Exec['trac_env_issues'], | 91 before => Exec['trac_env_issues'], |
91 path => "/usr/bin:/bin", | 92 path => "/usr/bin:/bin", |
92 user => trac, | 93 user => trac, |
93 onlyif => 'test -d /home/trac/environment', | 94 onlyif => 'test -d /home/trac/environment && \ |
| 95 test ! -e /home/trac/environment-issues', |
94 require => User['trac'], | 96 require => User['trac'], |
95 } | 97 } |
96 | 98 |
97 class {'nagios::client': | 99 class {'nagios::client': |
98 server_address => 'monitoring.adblockplus.org' | 100 server_address => 'monitoring.adblockplus.org' |
99 } | 101 } |
100 } | 102 } |
LEFT | RIGHT |