Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: manifests/issuesserver.pp

Issue 6532844914475008: #753 - Remove migration hacks (Closed)
Patch Set: Created Aug. 7, 2014, 2:35 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« 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') | Show Comments Hide Comments ('s')
OLDNEW
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 user => trac, 52 user => trac,
53 minute => '*/30', 53 minute => '*/30',
54 command => "mysql -utrac -p'${private::trac::database_password}' trac_orders --execute ' \ 54 command => "mysql -utrac -p'${private::trac::database_password}' trac_orders --execute ' \
55 INSERT INTO session_attribute (sid, authenticated, name, value) SELECT sid , authenticated, name, value \ 55 INSERT INTO session_attribute (sid, authenticated, name, value) SELECT sid , authenticated, name, value \
56 FROM trac.session_attribute WHERE authenticated = 1 AND name IN (\"email\" , \"password\") \ 56 FROM trac.session_attribute WHERE authenticated = 1 AND name IN (\"email\" , \"password\") \
57 ON DUPLICATE KEY UPDATE value=VALUES(value) ' >/dev/null 57 ON DUPLICATE KEY UPDATE value=VALUES(value) ' >/dev/null
58 ", 58 ",
59 require => Exec['trac_auth_cookie_view'], 59 require => Exec['trac_auth_cookie_view'],
60 } 60 }
61 61
62 # This directive is required due to legacy issues, where only one trac
63 # project was configured. Now we want to have more verbose names, e.g.
64 # tracd_issues and tracd_orders, but the spawn-fcgi module doesn't remove
65 # unmentioned former setups. So, in order to avoid conflicts or manual
66 # intervention during rollout, we must keep this statement here and never
67 # re-use the name again. Ugly, but neccessary.
68 spawn-fcgi::pool {"tracd":
69 ensure => absent,
70 require => Exec['tracd_kludge'],
71 }
72
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
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
77 # stopped before:
78 exec { 'tracd_kludge':
79 command => 'service spawn-fcgi stop',
80 onlyif => 'service spawn-fcgi status',
81 path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
82 notify => Service['spawn-fcgi'],
83 }
84
85 # Pretty similar to the "tracd" pool issue above: The trac-admin initenv
86 # command would fail for environment-issues after creation of the directory
87 # structure, when it comes to the database setup (which already exists),
88 # if we do not handle the existing resources manually..
89 exec { 'trac_env_issues_kludge':
90 command => 'ln -s environment /home/trac/environment-issues',
91 before => Exec['trac_env_issues'],
92 path => "/usr/bin:/bin",
93 user => trac,
94 onlyif => 'test -d /home/trac/environment && \
95 test ! -e /home/trac/environment-issues',
96 require => User['trac'],
97 }
98
99 class {'nagios::client': 62 class {'nagios::client':
100 server_address => 'monitoring.adblockplus.org' 63 server_address => 'monitoring.adblockplus.org'
101 } 64 }
102 } 65 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld