Merge lp:~mpontillo/maas/bug-1459876-packaging into lp:~maas-committers/maas/trunk
- bug-1459876-packaging
- Merge into trunk
Proposed by
Mike Pontillo
Status: | Superseded |
---|---|
Proposed branch: | lp:~mpontillo/maas/bug-1459876-packaging |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
4335 lines (+3891/-0) 88 files modified
debian/changelog (+1595/-0) debian/compat (+1/-0) debian/control (+233/-0) debian/copyright (+45/-0) debian/extras/20-maas.conf (+32/-0) debian/extras/99-maas (+5/-0) debian/extras/99-maas-sudoers (+12/-0) debian/extras/isc-dhcp-server.override (+1/-0) debian/extras/maas (+6/-0) debian/extras/maas-probe-dhcp (+7/-0) debian/extras/maas-provision (+7/-0) debian/extras/maas-proxy-common.sh (+34/-0) debian/extras/maas-proxy.conf (+37/-0) debian/extras/maas-region-admin (+22/-0) debian/extras/maas_remote_syslog_compress (+2/-0) debian/extras/squid3.override (+1/-0) debian/maas-cli.install (+2/-0) debian/maas-cli.links (+1/-0) debian/maas-cli.lintian-overrides (+1/-0) debian/maas-cluster-controller.config (+36/-0) debian/maas-cluster-controller.dirs (+2/-0) debian/maas-cluster-controller.install (+21/-0) debian/maas-cluster-controller.lintian-overrides (+1/-0) debian/maas-cluster-controller.logrotate (+15/-0) debian/maas-cluster-controller.maas-clusterd.service (+26/-0) debian/maas-cluster-controller.maas-clusterd.upstart (+52/-0) debian/maas-cluster-controller.maintscript (+7/-0) debian/maas-cluster-controller.postinst (+140/-0) debian/maas-cluster-controller.postrm (+29/-0) debian/maas-cluster-controller.preinst (+43/-0) debian/maas-cluster-controller.templates (+16/-0) debian/maas-common.install (+1/-0) debian/maas-common.logrotate (+9/-0) debian/maas-common.maintscript (+2/-0) debian/maas-common.postinst (+31/-0) debian/maas-common.postrm (+17/-0) debian/maas-dhcp.apparmor (+12/-0) debian/maas-dhcp.install (+1/-0) debian/maas-dhcp.maas-dhcpd.service (+27/-0) debian/maas-dhcp.maas-dhcpd.upstart (+65/-0) debian/maas-dhcp.maas-dhcpd6.service (+27/-0) debian/maas-dhcp.maas-dhcpd6.upstart (+65/-0) debian/maas-dhcp.maintscript (+2/-0) debian/maas-dhcp.postinst (+23/-0) debian/maas-dhcp.postrm (+17/-0) debian/maas-dhcp.preinst (+16/-0) debian/maas-dns.dirs (+1/-0) debian/maas-dns.postinst (+78/-0) debian/maas-dns.postrm (+25/-0) debian/maas-proxy.dirs (+1/-0) debian/maas-proxy.install (+3/-0) debian/maas-proxy.logrotate (+24/-0) debian/maas-proxy.maas-proxy.service (+15/-0) debian/maas-proxy.maas-proxy.upstart (+24/-0) debian/maas-proxy.postinst (+22/-0) debian/maas-proxy.postrm (+12/-0) debian/maas-region-controller-min.apport (+63/-0) debian/maas-region-controller-min.install (+34/-0) debian/maas-region-controller-min.links (+8/-0) debian/maas-region-controller-min.lintian-overrides (+6/-0) debian/maas-region-controller-min.logrotate (+15/-0) debian/maas-region-controller-min.maas-regiond-worker.upstart (+25/-0) debian/maas-region-controller-min.maas-regiond-worker@.service (+27/-0) debian/maas-region-controller-min.maas-regiond.service (+24/-0) debian/maas-region-controller-min.maas-regiond.upstart (+17/-0) debian/maas-region-controller-min.maintscript (+6/-0) debian/maas-region-controller-min.postinst (+136/-0) debian/maas-region-controller-min.postrm (+42/-0) debian/maas-region-controller-min.preinst (+35/-0) debian/maas-region-controller-min.prerm (+9/-0) debian/maas-region-controller-min.templates (+22/-0) debian/maas-region-controller.config (+45/-0) debian/maas-region-controller.postinst (+151/-0) debian/maas-region-controller.postrm (+47/-0) debian/maas-region-controller.prerm (+13/-0) debian/maintscript (+2/-0) debian/patches/01-fix-database-settings.patch (+17/-0) debian/patches/02-pserv-config.patch (+18/-0) debian/patches/series (+2/-0) debian/po/POTFILES.in (+2/-0) debian/po/templates.pot (+82/-0) debian/python-django-maas.install (+2/-0) debian/python-maas-client.install (+1/-0) debian/python-maas-provisioningserver.install (+5/-0) debian/python-maas-provisioningserver.lintian-overrides (+2/-0) debian/rules (+77/-0) debian/source/format (+1/-0) debian/watch (+3/-0) |
To merge this branch: | bzr merge lp:~mpontillo/maas/bug-1459876-packaging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Maintainers | Pending | ||
Review via email: mp+261024@code.launchpad.net |
This proposal supersedes a proposal from 2015-06-03.
This proposal has been superseded by a proposal from 2015-06-03.
Commit message
Description of the change
This change depends on the following MP:
https:/
With this change to the packaging, we'll vacuum the database whenever an upgrade occurs (just after we migrate the database).
This allows us a window to clean up the database without affecting MAAS functionality.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'debian' |
2 | === added file 'debian/changelog' |
3 | --- debian/changelog 1970-01-01 00:00:00 +0000 |
4 | +++ debian/changelog 2015-06-03 20:06:06 +0000 |
5 | @@ -0,0 +1,1595 @@ |
6 | +maas (1.8.0~rc2+bzr3972-0ubuntu1) UNRELEASED; urgency=medium |
7 | + |
8 | + * UNRELEASED |
9 | + |
10 | + [ Mike Pontillo ] |
11 | + * Run the 'maas-region-admin purge_unused_images' command at the same |
12 | + time as database migrations occur, so that deleted MAAS images |
13 | + don't endlessly grow the database. (LP: #1459876) |
14 | + |
15 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 02 Jun 2015 09:27:54 -0400 |
16 | + |
17 | +maas (1.8.0~rc1+bzr3972-0ubuntu1) trusty; urgency=medium |
18 | + |
19 | + * New upstream release, 1.8.0 RC1 bzr3972. |
20 | + * debian/copyright: Add copyright headers for ng-tags-input.js. |
21 | + * debian/control: Bump Standards-Version |
22 | + |
23 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 27 May 2015 20:16:40 -0400 |
24 | + |
25 | +maas (1.8.0~beta8+bzr3951-0ubuntu1) trusty; urgency=medium |
26 | + |
27 | + * New upstream release, 1.8.0 beta 8 bzr3951. |
28 | + |
29 | + [ Raphaël Badin ] |
30 | + * debian/extras/99-maas-sudoers: Allow maas to check the status of |
31 | + maas-dhcpd and maas-dhcp6 and start these services (LP: #1457708). |
32 | + |
33 | + [ Andres Rodriguez ] |
34 | + * debian/rules: Ensure maas-regiond-worker is not started in packaging. |
35 | + |
36 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 21 May 2015 19:18:22 -0400 |
37 | + |
38 | +maas (1.8.0~beta7+bzr3926-0ubuntu1) trusty; urgency=medium |
39 | + |
40 | + * New upstream release, 1.8.0 beta 7 bzr3926. |
41 | + |
42 | + [ Andres Rodriguez ] |
43 | + * debian/{maas-cluster-controller,maas-common, |
44 | + maas-region-controller-min}.postinst: Cleaned up to correctly create |
45 | + log dir permissions (LP: #1457191) |
46 | + |
47 | + [ Gavin Panella ] |
48 | + * Create maas-regiond workers for systemd. |
49 | + |
50 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 20 May 2015 17:03:13 -0400 |
51 | + |
52 | +maas (1.8.0~beta6+bzr3891-0ubuntu1) trusty; urgency=medium |
53 | + |
54 | + * New upstream release, 1.8.0 beta 6 bzr3904: |
55 | + |
56 | + [ Gavin Panella ] |
57 | + * Drop the use of daemontools in favor of having upstart track |
58 | + thread processes: |
59 | + - d/maas-region-controller-min.maas-regiond.upstart: Drop use of |
60 | + daemontools; use maas-regiond-worker |
61 | + - d/maas-region-controller-min.maas-regiond-worker.upstart: Add. |
62 | + - d/control: Drop depends on daemontools. |
63 | + |
64 | + [ Andres Rodriguez ] |
65 | + * debian/maas-common.{postinst,logrotate}: Create maas.log if non-existent |
66 | + and add log rotation, provided maas.log exists both in the Region |
67 | + and in the Cluster (LP: #1381603) |
68 | + |
69 | + -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 09 May 2015 15:03:17 +0100 |
70 | + |
71 | +maas (1.8.0~beta5+bzr3867-0ubuntu1) trusty; urgency=medium |
72 | + |
73 | + * New upstream release, 1.8.0 Beta 5 bzr3867. |
74 | + |
75 | + [ Andres Rodriguez ] |
76 | + * d/p/02-pserv.yaml: Fix config file (LP: #1449862) |
77 | + |
78 | + [ Mike Pontillo ] |
79 | + * Run DNS reconfiguration if either 'forwarders' or 'dnssec-validation' |
80 | + keywords exist in named.conf.options (LP: #1384334) |
81 | + |
82 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 24 Apr 2015 18:55:47 -0400 |
83 | + |
84 | +maas (1.8.0~beta4+bzr3844-0ubuntu1) trusty; urgency=medium |
85 | + |
86 | + * New upstream release. 1.8.0 Beta 4 bzr2344 |
87 | + * debian/maas-dhcpd.maas-dhcpd.service: Remove whitespace in unit that |
88 | + was making systemd crash (LP: #1446699) |
89 | + * debian/maas-proxy.maas-proxy.service: Fix proxy to correctly run |
90 | + pre-start script. |
91 | + * debian/maas-dns.postinst: Ensure permissions are fixed also on upgrade. |
92 | + |
93 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 21 Apr 2015 13:00:49 -0400 |
94 | + |
95 | +maas (1.8.0~beta3+bzr3825-0ubuntu1) trusty; urgency=medium |
96 | + |
97 | + * New upstream release. 1.8.0 Beta3 bzr3825 (LP: #1432666): |
98 | + - Fixx issues with concurrent DB access and the isolation level |
99 | + that made MAAS unusable in highload environments. |
100 | + |
101 | + [ Gavin Panella ] |
102 | + * Run one maas-regiond per CPU core. |
103 | + |
104 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 16 Apr 2015 21:26:21 +0200 |
105 | + |
106 | +maas (1.8.0~beta2+bzr3814-0ubuntu1) trusty; urgency=medium |
107 | + |
108 | + * New upstream release. 1.8.0 Beta2 bzr3814. |
109 | + |
110 | + [ Andres Rodriguez ] |
111 | + * Restart apache2 after the region is restarted on a install. (LP: #1438782) |
112 | + |
113 | + [ Mike Pontillo ] |
114 | + * Stop maas-clusterd in prerm so that database purge succeeds (LP: #1044559) |
115 | + |
116 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 06 Apr 2015 11:00:00 -0400 |
117 | + |
118 | +maas (1.8.0~beta1+bzr3777-0ubuntu1) trusty; urgency=medium |
119 | + |
120 | + * New upstream release. 1.8.0 Beta1 bzr 3777. |
121 | + |
122 | + [ Mike Pontillo ] |
123 | + * debian/extras/maas-region-admin: Fix Path setting. |
124 | + * debian/control: Properly depend on python-apt |
125 | + |
126 | + [ Andres Rodriguez ] |
127 | + * debian/maas-dhcp.maas-dhcpd[6].service: Fix units to correctly run |
128 | + in vivid. |
129 | + * debian/maas-proxy.maas-proxy.service: Fix unit to use correct daemon. |
130 | + |
131 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 30 Mar 2015 19:17:47 -0400 |
132 | + |
133 | +maas (1.8.0~alpha9+bzr3750-0ubuntu1) trusty; urgency=medium |
134 | + |
135 | + * New upstream release. MAAS 1.9.0 Alpha 9 bzr3692: |
136 | + - fix bulk actions for isolation level changes. |
137 | + - fix commissioning related isolation level / transaction issues. |
138 | + |
139 | + [ Andres Rodriguez ] |
140 | + * Make sure MAAS works with python-django16 in vivid. |
141 | + |
142 | + [Gavin Panella] |
143 | + * debian/extras/99-maas-sudoers |
144 | + debian/maas-cluster-controller.install |
145 | + - Do not install maas-import-pxe-files; it is no longer used, and is |
146 | + not present in upstream. |
147 | + |
148 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 20 Mar 2015 20:27:02 -0400 |
149 | + |
150 | +maas (1.8.0~alpha8+bzr3692-0ubuntu1) trusty; urgency=medium |
151 | + |
152 | + * New upstream release, 1.8.0~alpha8 bzr 3692: |
153 | + - Fix bulk actions to not fail due to transaction errors. |
154 | + |
155 | + [ Steve Langasek ] |
156 | + * Depend on pxelinux for pxelinux.0, not on syslinux-dev. (LP: #1433697) |
157 | + |
158 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Mar 2015 18:46:41 -0400 |
159 | + |
160 | +maas (1.8.0~alpha7+bzr3664-0ubuntu1) trusty; urgency=medium |
161 | + |
162 | + * New upstream release, 1.8.0~alpha7 bzr3664 |
163 | + |
164 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 10 Mar 2015 16:36:40 -0400 |
165 | + |
166 | +maas (1.8.0~alpha6+bzr3625-0ubuntu1) trusty; urgency=medium |
167 | + |
168 | + * New upstream release, 1.8.0~alpha6 bzr3625: |
169 | + - Add ability to select OS when we Deploy via a bulk action. |
170 | + |
171 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 06 Mar 2015 18:10:46 -0500 |
172 | + |
173 | +maas (1.8.0~alpha5+bzr3609-0ubuntu1) trusty; urgency=medium |
174 | + |
175 | + * New upstream release, 1.8.0~alpha5 bzr3601: |
176 | + - Add new 'Devices' page in the WebUI. |
177 | + - Add support for VMWare's vSphere. |
178 | + * debian/control: |
179 | + - Add Depends on python-pyvmomi; Drop Depends on python-pyscss. |
180 | + |
181 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 05 Mar 2015 11:31:14 -0500 |
182 | + |
183 | +maas (1.8.0~alpha4+bzr3581-0ubuntu1) trusty; urgency=medium |
184 | + |
185 | + * New upstream release, 1.8.0~alpha4 bzr3581: |
186 | + - Adds new 'Add Hardware' button on the WebUI. |
187 | + - Adds new 'Add Chassis' button on the WebUI. |
188 | + |
189 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 27 Feb 2015 19:50:00 -0500 |
190 | + |
191 | +maas (1.8.0~alpha3+bzr3568-0ubuntu1) trusty; urgency=medium |
192 | + |
193 | + * New upstream release, 1.8.0~alpha3 bzr3568 |
194 | + - Adds support for Microsoft OCP Chassis. |
195 | + * debian/control: |
196 | + - Add python-bson as a depends. |
197 | + - Remove python-pyscss as a build dependency. |
198 | + |
199 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 24 Feb 2015 15:47:07 -0500 |
200 | + |
201 | +maas (1.8.0~alpha2+bzr3545-0ubuntu1) trusty; urgency=medium |
202 | + |
203 | + * New upstream release, 1.8.0~alpha2 bzr3545 |
204 | + * debian/control: |
205 | + - Depends on libjs-angularjs (LP: #1423457) |
206 | + - Depends on ubuntu-cloudimage-keyring for region (LP: #1424287) |
207 | + |
208 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 18 Feb 2015 16:31:02 -0500 |
209 | + |
210 | +maas (1.8.0~alpha1+bzr3523-0ubuntu1) trusty; urgency=medium |
211 | + |
212 | + * New upstream release, 1.8.0~alpha1 bzr3523 |
213 | + |
214 | + [ Blake Rouse ] |
215 | + * debian/control: added python-pyscss as a build dependency. |
216 | + * debian/rules: build scss files to maas-styles.css and remove scss files |
217 | + from the static files directory. |
218 | + |
219 | + [ Jeroen Vermeulen ] |
220 | + * debian/maas-cluster-controller.postinst: configure MAAS_URL through new |
221 | + "maas-provision configure-maas-url" sub-command instead of with "sed". |
222 | + |
223 | + [ Andres Rodriguez ] |
224 | + * Set 'maas' homedir to '/var/lib/maas' (LP: #1399016): |
225 | + - debian/maas-common.postinst: Do not try to update 'maas' |
226 | + home user dir on upgrade. |
227 | + * debian/control: Tighten Dependency versioning of some packages. |
228 | + * debian/maas-region-controller-min.preinst: Handle upgrades to remove |
229 | + legacy files. |
230 | + * debian/maas-region-controller{-min}.postinst: Simplify postinsts. |
231 | + * Drop depends on python-celery, python-oops, python-oops-twisted, |
232 | + python-oops-datedir-repo, python-oosp-wsgi |
233 | + * Drop maas-cluster-http.conf; Drop depends on apache2 for |
234 | + maas-cluster-controller. |
235 | + |
236 | + [ Gavin Panella ] |
237 | + * debian/maas-region-controller-min.maas-regiond.upstart |
238 | + - Upstart script for the new maas-regiond. |
239 | + - Use setuid/setgid to drop root privs before running script. |
240 | + - Don't write a pid file. |
241 | + * debian/maas-cluster-controller.maas-clusterd.upstart |
242 | + - Start maas-clusterd; it's no longer called maas-pserv. |
243 | + * debian/maas-region-controller-min.install |
244 | + - Don't install wsgi.py; it's no longer used. |
245 | + * debian/rules |
246 | + - Install maas-regiond plugin. |
247 | + * debian/maas-region-controller-min.apport |
248 | + debian/maas-region-controller-min.logrotate |
249 | + debian/maas-region-controller-min.postinst |
250 | + debian/maas-region-controller.postinst |
251 | + - Change maas-django.log to regiond.log. |
252 | + * debian/maas-region-controller.postinst |
253 | + - Restart maas-regiond after installation. |
254 | + - a2enmod rewrite module (LP: #1236544) |
255 | + * debian/maas-region-controller.postinst |
256 | + - Restart maas-regiond after installation. |
257 | + * debian/control |
258 | + debian/maas-region-controller-min.postinst |
259 | + debian/maas-region-controller.postinst |
260 | + - mod_wsgi is no longer used. |
261 | + * debian/maas-region-controller-min.logrotate |
262 | + - No longer used; maas-regiond uses rotatelogs. |
263 | + - a2enmod rewrite module (LP: #1236544) |
264 | + * debian/patches/01-fix-database-settings.patch |
265 | + - Move STATIC_ROOT setting upstream. |
266 | + - Simplify database configuration hunk. |
267 | + * debian/maas-cluster-controller.logrotate |
268 | + debian/maas-region-controller.logrotate |
269 | + - Use copytruncate; even though it's sub-optimal, this is currently |
270 | + the best way to integrate logrotate with twistd. |
271 | + - Limit the size of the logs to 50MB, but don't rotate unless |
272 | + they're more than 10MB. |
273 | + - Drop privileges and run as maas/maas. |
274 | + * debian/maas-region-controller-min.maas-regiond.upstart |
275 | + debian/maas-cluster-controller.maas-clusterd.upstart |
276 | + - Redirect stdout and stderr from twistd directly to the daemon's |
277 | + respective log file. |
278 | + * debian/maas-region-controller-min.apport |
279 | + - pserv.log has been renamed to clusterd.log. |
280 | + |
281 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 14 Nov 2014 09:04:29 -0500 |
282 | + |
283 | +maas (1.7.0+bzr3299-0ubuntu1) utopic; urgency=medium |
284 | + |
285 | + * New upstream release, 1.7.0. |
286 | + |
287 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 14 Nov 2014 08:38:39 -0500 |
288 | + |
289 | +maas (1.7.0~rc3+bzr3299-0ubuntu1) utopic; urgency=medium |
290 | + |
291 | + * New upstream release, RC3 bzr 3299 |
292 | + - Fix dashboard tooltip messages which had stopped being displayed |
293 | + (LP: #1390434) |
294 | + |
295 | + -- Julian Edwards <julian.edwards@canonical.com> Tue, 11 Nov 2014 12:23:07 +1000 |
296 | + |
297 | +maas (1.7.0~rc2+bzr3297-0ubuntu1) utopic; urgency=medium |
298 | + |
299 | + * New upstream release, RC2 bzr 3297 |
300 | + - Allow marking a node in the DISK_ERASING state as broken (LP: #1388919) |
301 | + - Prevent concurrent allocations of static IP addresses from returning |
302 | + the same clashing address. (LP: #1387262) |
303 | + |
304 | + [ Andres Rodriguez ] |
305 | + * debian/maas-cluster-controller.postinst: Make sure that cluster sets |
306 | + the correct permissions for proxy log dir if running on the same |
307 | + system. (LP: #1377964) |
308 | + |
309 | + -- Julian Edwards <julian.edwards@canonical.com> Fri, 07 Nov 2014 09:30:52 +1000 |
310 | + |
311 | +maas (1.7.0~rc1+bzr3295-0ubuntu1) trusty; urgency=medium |
312 | + |
313 | + * New Upstream Release, RC1 bzr 3295 |
314 | + - If using MSCM (Moonshot Chassis Manager) on a M300, do not overwrite |
315 | + power parameters (LP: #1382075) |
316 | + - Do not write DNS hostmaps if its PXE Mac is not on a managed cluster |
317 | + interface. (LP: #1382108) |
318 | + - Show os field in boot source selections API. (LP: #1384383) |
319 | + - Add documentation for new Import Images features (LP: #1384010) |
320 | + - Allow releasing if Failed to Disk Wipe or Release (LP: #1384821) |
321 | + - Handle missing subarch when creating a node via RPC for |
322 | + probe-and-enlist methods (LP: #1384778) |
323 | + - Update default waiting policy for power actions to increase time of |
324 | + wait to handle different type of BMC's (LP: #1384758) |
325 | + - Use HTTP_PROXY to download images if configured (LP: #1384464) |
326 | + - Return 503 response for PowerActionAlreadyInProgress and add a |
327 | + 'Retry-after' Header. (LP: #1384001) |
328 | + - Stop ImportResourcesService from crashing when an import fails |
329 | + (LP: #1386722) |
330 | + - Convert TFTP request paths that contain backslashes to forward |
331 | + slashes. (LP: #1387191) |
332 | + - Do not try to delete synced boot images if not new ones are present |
333 | + to handle a weird race. (LP: #1387133) |
334 | + - Fix storage unit shown on the node edit page (LP: #1387431) |
335 | + - Use CompressedAmpList in UpdateLeases to now parse |
336 | + ~3500 leases (LP: #1387515, LP: #1387515) |
337 | + - Updated XPath expression for discovering storage capacity from new |
338 | + lshw changes. (LP: #1387380) |
339 | + - Add sub status field on API. |
340 | + - Generate DNS mappings for the Dynamic IP range. Hostname generation |
341 | + is limited to /16. (LP: #1382190) |
342 | + - Use configured HTTP Proxy to download boot images (LP: #1384464) |
343 | + * debian/extras/maas-proxy-common.sh: Ensure that permissions are correct |
344 | + before starting maas-proxy. (LP: #1382266) |
345 | + |
346 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 27 Oct 2014 21:53:43 -0400 |
347 | + |
348 | +maas (1.7.0~beta8+bzr3272-0ubuntu1) utopic; urgency=medium |
349 | + |
350 | + * New Upstream Release, Beta 8 bzr 3272. |
351 | + - Maintain backward compatibility with status codes to not break |
352 | + client MAAS API users. (LP: #1383609) |
353 | + - Allow users to disable DHCP NIC scanning during commissioning otherwise |
354 | + this can lead machines not being able to commission (LP: #1383384) |
355 | + - Ensure that MAAS can correctly download, and install HWE Kernels, and |
356 | + not crash in the process. (LP: #1357532, LP: #1382281) |
357 | + - Add a lock to ensure we don't give the same 2 systems to two different |
358 | + users when acquiring a machine. (LP: #1382575) |
359 | + |
360 | + [ Michael McCracken ] |
361 | + * debian/maas-dns.postrm: ensure named.conf is cleaned of maas |
362 | + includes (LP: #1346538) |
363 | + |
364 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 22 Oct 2014 12:55:08 -0400 |
365 | + |
366 | +maas (1.7.0~beta7+bzr3266-0ubuntu1) utopic; urgency=medium |
367 | + |
368 | + * New Upstream Snapshot, Beta 7 bzr3266 |
369 | + |
370 | + [ Jeroen Vermeulen ] |
371 | + * debian/extras/99-maas-sudoers |
372 | + debian/maas-dhcp.postinst |
373 | + debian/rules |
374 | + - Add second DHCP server instance for IPv6. |
375 | + * debian/maas-region-controller-min.install |
376 | + debian/maas-region-controller-min.lintian-overrides |
377 | + - Install deployment user-data: maas_configure_interfaces.py script. |
378 | + * debian/maas-cluster-controller.links |
379 | + debian/maas-cluster-controller.install |
380 | + debian/maas-cluster-controller.postinst |
381 | + - Reflect Celery removal changes made in trunk r3067. |
382 | + - Don't install celeryconfig_cluster.py any longer. |
383 | + - Don't install maas_local_celeryconfig_cluster.py any longer. |
384 | + - Don't symlink maas_local_celeryconfig_cluster.py from /etc to /usr. |
385 | + - Don't insert UUID into maas_local_celeryconfig_cluster.py. |
386 | + |
387 | + [ Andres Rodriguez ] |
388 | + * debian/maas-region-controller-min.postrm: Cleanup lefover files. |
389 | + * debian/maas-dhcp.postrm: Clean leftover configs. |
390 | + * Provide new maas-proxy package that replaces the usage of |
391 | + squid-deb-proxy: |
392 | + - debian/control: New maas-proxy package that replaces the usage |
393 | + of squid-deb-proxy; Drop depends on squid-deb-proxy. |
394 | + - Add upstrart job. |
395 | + - Ensure squid3 is stopped as maas-proxy uses a caching proxy. |
396 | + * Remove Celery references to cluster controller: |
397 | + - Rename upstart job from maas-pserv to maas-cluster; rename |
398 | + maas-cluster-celery to maas-cluster-register. Ensure services |
399 | + are stopped on upgrade. |
400 | + - debian/maintscript: Cleanup config files. |
401 | + - Remove all references to the MAAS celery daemon and config |
402 | + files as we don't use it like that anymore |
403 | + * Move some entries in debian/maintscript to |
404 | + debian/maas-cluster-controller.maintscript |
405 | + * Remove usage of txlongpoll and rabbitmq-server. Handle upgrades |
406 | + to ensure these are removed correctly. |
407 | + |
408 | + [ Jason Hobbs ] |
409 | + * debian/maas-region-controller-min.install: Install |
410 | + maas-generate-winrm-cert script. |
411 | + |
412 | + [ Raphaël Badin ] |
413 | + * debian/extras/maas-region-admin: Bypass django-admin as it prints |
414 | + spurious messages to stdout (LP: #1365130). |
415 | + |
416 | + [Louis Bouchard] |
417 | + * debian/maas-cluster-controller.postinst: |
418 | + - Exclude /var/log/maas/rsyslog when changing ownership |
419 | + (LP: #1346703) |
420 | + |
421 | + [Gavin Panella] |
422 | + * debian/maas-cluster-controller.maas-clusterd.upstart: |
423 | + - Don't start-up the cluster controller unless a shared-secret has |
424 | + been installed. |
425 | + * debian/maas-cluster-controller.maas-cluster-register.upstart: Drop. |
426 | + |
427 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 21 Aug 2014 19:36:30 -0400 |
428 | + |
429 | +maas (1.7.0~beta1+bzr2781-0ubuntu1) utopic; urgency=medium |
430 | + |
431 | + * New upstream release, 1.7.0 Beta 1 |
432 | + |
433 | + [Diogo Matsubara] |
434 | + * debian/control: |
435 | + - maas-cluster-controller depends on syslinux-dev | |
436 | + syslinux-common (LP: #1328659) |
437 | + - python-maas-provisioningserver depends on |
438 | + python-paramiko (LP: #1334401) |
439 | + |
440 | + [Jeroen Vermeulen] |
441 | + * debian/extras/99-maas-sudoers: |
442 | + - Let maas user import, including sudo tgt-admin and sudo uec2roottar. |
443 | + * debian/maas-cluster-controller.install: |
444 | + - Stop installing obsolete file bootresources.yaml. |
445 | + |
446 | + [ Raphaël Badin ] |
447 | + * debian/control: |
448 | + - maas-cluster-controller depends on python-pexpect |
449 | + * debian/extras/99-maas-sudoers: |
450 | + - Add rule 'maas-dhcp-server stop' job. |
451 | + |
452 | + [ Greg Lutostanski ] |
453 | + * debian/control: |
454 | + - maas-cluster-controller depends on grub-common |
455 | + - maas-provisioningserver not maas-cluster-controller depends on |
456 | + python-pexpect (LP: #1352273) |
457 | + - maas-provisioningserver not maas-cluster-controller depends on |
458 | + python-seamicroclient (LP: #1332532) |
459 | + |
460 | + [ Gavin Panella ] |
461 | + * debian/maas-cluster-controller.postinst |
462 | + - Allow maas-pserv to bind to all IPv6 addresses too. |
463 | + |
464 | + [ Julian Edwards ] |
465 | + * debian/maas-region-controller-min.apport |
466 | + debian/maas-region-controller-min.logrotate |
467 | + debian/maas-region-controller-min.postinst |
468 | + debian/maas-region-controller.postinst |
469 | + - Change the log file name maas.log to maas-django.log |
470 | + * debian/maas-cluster-controller.postinst |
471 | + debian/maas-common.install |
472 | + debian/maas-region-controller-min.postinst |
473 | + debian/maas-region-controller.postinst |
474 | + - Install /var/log/maas/maas.log as a syslog file. |
475 | + - Ensure logging is set up for upgrades |
476 | + |
477 | + [ Graham Binns ] |
478 | + * debian/maas-region-controller.postinst: |
479 | + - Add symlinks for squid3, squid-deb-proxy and apache log directories to |
480 | + /var/log/maas. |
481 | + |
482 | + [ Andres Rodriguez ] |
483 | + * debian/maas-region-controller.postinst: Force symlink creation |
484 | + for external logs. |
485 | + * debian/maas-region-controller.postinst: Do not change celery's |
486 | + rabbitmq password on upgrade that to not lock remote |
487 | + Cluster Controllers if upgrading from 1.5+. (LP: #1300507) |
488 | + |
489 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 21 Aug 2014 14:05:40 -0400 |
490 | + |
491 | +maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium |
492 | + |
493 | + * New upstream release |
494 | + - Add support to install Third Party Drivers. In order for this to be |
495 | + used the user will have to go to the Settings page to enable the |
496 | + installation of these drivers. (LP: #1305839) |
497 | + - Use release images instead of daily. (LP: #1306701) |
498 | + - Quote interface name in dhcpd.template, otherwise DHCP server fails |
499 | + to start. (LP: #1306335) |
500 | + - Fix IntegrityError, when multiple processes are trying to register |
501 | + the same component. (LP: #1307415) |
502 | + - Add missing armhf commissioning template (LP: #1307780) |
503 | + * debian/maas-region-controller-min.install: Install drivers.yaml. |
504 | + * debian/maas-region-controller.postinst: No longer show the |
505 | + installation note by default. (LP: #1284652) |
506 | + |
507 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Apr 2014 19:02:00 -0400 |
508 | + |
509 | +maas (1.5+bzr2236-0ubuntu1) trusty; urgency=medium |
510 | + |
511 | + * New upstream bugfix release. |
512 | + - Fix simplestreams path to use the new data source path. (LP: #1305118) |
513 | + - Fix commissioning_distro_series validation failure. (LP: #1304408) |
514 | + - Fix DB migration 0072_remove_ipmi_autodetec. (LP: #1302156) |
515 | + - Update documentation. |
516 | + * debian/maas-region-controller-min.maas-region-celery.upstart, |
517 | + debian/maas-region-controller-min.maas-txlongpoll.upstart: Fix ISO |
518 | + install by making sure rabbitmq user is really created if it does not |
519 | + exist (LP: #1298559) |
520 | + |
521 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Apr 2014 18:36:55 -0400 |
522 | + |
523 | +maas (1.5+bzr2230-0ubuntu1) trusty; urgency=medium |
524 | + |
525 | + * New upstream bugfix release: |
526 | + - Fix Cluster Controller to handle deprecated config items gracefull. |
527 | + Otherwise it fails on upgrades. (LP: #1302772) |
528 | + - Fix documentation generation and referencing. (LP: #1302956) |
529 | + - Ensure we PXE boot when we turn on SM15K systems. (LP: #1303915) |
530 | + |
531 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 07 Apr 2014 10:26:51 -0400 |
532 | + |
533 | +maas (1.5+bzr2227-0ubuntu1) trusty; urgency=medium |
534 | + |
535 | + * New upstream bugfix release: |
536 | + - Fix catching exceptions raised by |
537 | + twisted.conch.ssh.keys.Key.fromString (LP: #1298788) |
538 | + - Fix validationg in default NodeGroupInterface.broadcast_ip making it |
539 | + optional. (LP: #1299374) |
540 | + - Drop install-pxe-bootloader as it conflicts with newer import script. |
541 | + - Remove references to old import script. |
542 | + - Fix changes that cause overwriting of existing entries. |
543 | + - Fix inappropriate ValidationError when defining networks with nested |
544 | + (but non-identical) address ranges. (LP: #1299114) |
545 | + - Fix issue where if a node does not provide an architecture type on dhcp |
546 | + request, or no other boot method is available for that architecture, |
547 | + the node still uses pxelinux.0 to boot. (LP: #1300285) |
548 | + - Take an advisory lock to prevent concurrent creation of the |
549 | + eventloops table. (LP: #1300363) |
550 | + - Remove the cloud_images_archive setting, as it conflicts with new |
551 | + import script. (LP: #1300587) |
552 | + - Add a 'logout confirmation' page. Using this, the logout action is |
553 | + protected against CSRF attacks because it uses a POST request, in |
554 | + conjunction with Django's CSRF protection feature. (LP: #1298790) |
555 | + - Fix cluster listings when dealing with large number of clusters by |
556 | + paginating it. (LP: #1301242) |
557 | + - Change list_boot_images() so that it can cope with a missing boot |
558 | + images directory: this happens if the reporting task runs before the |
559 | + images have been imported. (LP: #213984) |
560 | + - Fix internal server error on fast path installer. (LP: #1293676) |
561 | + - Fix uploading files using maas-cli. (LP: #1187826) |
562 | + - Fix SM15k Invalid Power Control and Fix enlisting machines with |
563 | + 2.0 api. (LP: #1302818, LP: #1302819) |
564 | + |
565 | + [ Andres Rodriguez ] |
566 | + * debian/maas-cluster-controller.install: Install UEFI templates |
567 | + * debian/maas-cluster-controller.dirs: Create 'boot-resources' dir. |
568 | + |
569 | + [ Jason Hobbs ] |
570 | + * debian/extras/99-maas: Allow access to keyserver.ubuntu.com via |
571 | + squid-deb-proxy. |
572 | + |
573 | + [Jeroen Vermeulen] |
574 | + * debian/maas-cluster-controller.postinst: |
575 | + - Make the tgt config link point to the new boot-resources dir. |
576 | + * debian/maas-region-controller-min.dirs: |
577 | + - Don't create /var/lib/maas/tftp. |
578 | + |
579 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 03 Apr 2014 13:45:02 -0400 |
580 | + |
581 | +maas (1.5+bzr2204-0ubuntu1) trusty; urgency=low |
582 | + |
583 | + * New upstream release (LP: #1281881) |
584 | + |
585 | + [ Andres Rodriguez ] |
586 | + * debian/maas-region-controller-min.templates: Set installation note to false |
587 | + by default. |
588 | + * Check rabbitmqctl is present before running commands: |
589 | + - debian/maas-region-controller-min.maas-region-celery.upstart. |
590 | + - debian/maas-region-controller-min.maas-txlongpoll.upstart. |
591 | + * make sure maas_longpoll rabbitmq user is created/with correct password on |
592 | + a package reconfigure. |
593 | + * debian/maas-dns.postinst: Fix upgrade setup of named.conf.options. |
594 | + * debian/maas-cluster-controller.install: Install UEFI templates (LP: #1299143) |
595 | + |
596 | + [ Julian Edwards ] |
597 | + * debian/extas/maas: Echo warning to stderr so json stdout is not polluted |
598 | + * debian/maas-cluster-controller.postinst: Run upgrade-cluster on each |
599 | + upgrade |
600 | + * debian/maas-dns.postinst: Call edit_named_options to add a line in |
601 | + /etc/bind/named.conf.options that includes the |
602 | + /etc/named/maas/named.conf.options.inside.maas file. |
603 | + * debian/control: |
604 | + - maas-dns depends on python-iscpy |
605 | + - maas-cluster-controller depends on python-seamicroclient |
606 | + * debian/maas-cluster-controller.install: Install bootresources.yaml |
607 | + |
608 | + [ Dustin Kirkland ] |
609 | + * debian/control: LP: #1297097 |
610 | + - clean up package descriptions, modernize, and more clearly/simply |
611 | + explain what each package does |
612 | + - drop "Ubuntu" in front of MAAS, clean up command line/API description |
613 | + |
614 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 28 Mar 2014 10:43:53 -0400 |
615 | + |
616 | +maas (1.5+bzr1977-0ubuntu1) trusty; urgency=low |
617 | + |
618 | + * New upstream bugfix release. |
619 | + - setup.py: Install missing shell snippet |
620 | + |
621 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 19 Feb 2014 16:31:45 -0500 |
622 | + |
623 | +maas (1.5+bzr1976-0ubuntu1) trusty; urgency=low |
624 | + |
625 | + * New upstream release. |
626 | + * debian/maas-cluster-controller.postinst: Make sure upgrades handle |
627 | + authbind upgrades too. |
628 | + |
629 | + -- Andres Rodriguez <andreserl@ubuntu.com> Sun, 16 Feb 2014 22:56:36 -0500 |
630 | + |
631 | +maas (1.5+bzr1951-0ubuntu1) trusty; urgency=low |
632 | + |
633 | + * New upstream release |
634 | + * debian/maas-cluster-controller.postinst: Also authbind port 69. |
635 | + * debian/maas-cluster-controller.maas-pserv.upstart: Export MAAS_URL. |
636 | + |
637 | + -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 16:16:38 -0500 |
638 | + |
639 | +maas (1.5+bzr1948-0ubuntu2) trusty; urgency=low |
640 | + |
641 | + * debian/maas-cluster-controller.postinst: Make sure generator on |
642 | + pserv.yaml is updated on upgrade or reconfigure. (LP: #1273197) |
643 | + * debian/maas-cluster-controller.maas-pserv.upstart: Make sure maas-pserv |
644 | + is started with authbind. |
645 | + |
646 | + -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 13:55:20 -0500 |
647 | + |
648 | +maas (1.5+bzr1948-0ubuntu1) trusty; urgency=low |
649 | + |
650 | + * New upstream release. |
651 | + |
652 | + [ Graham Binns ] |
653 | + * debian/control: Depends on python-jsonschema. |
654 | + |
655 | + [ Andres Rodriguez ] |
656 | + * debian/maas-region-controller-min.posinst: Make txlongpoll.yaml only |
657 | + readable by the app and not world readeable. |
658 | + * debian/patches/02-pserv-config.patch: Refreshed. |
659 | + |
660 | + [ Julian Edwards ] |
661 | + * debian/extras/maas-cli renamed to debian/extras/maas, and introduce |
662 | + a deprecation warning in favour of using maas over maas-cli. |
663 | + * debian/extras/maas renamed to debian/extras/maas-region-admin |
664 | + * debian/maas-cli.install: install debian/extras/maas |
665 | + * debian/maas-dns.postinst: Invoke maas-region-admin instead of maas |
666 | + * debian/maas-region-controller-min.install: install maas-region-admin |
667 | + instead of maas |
668 | + * debian/maas-region-controller.postinst: Invoke maas-region-admin instead |
669 | + of maas |
670 | + * debian/maas-cli.links: Link from maas to maas-cli for backward compat. |
671 | + |
672 | + [ Seth Arnold ] |
673 | + * debian/maas-region-controller-min.postinst: Make sure txlongpoll.yaml |
674 | + gets correct permissions on upgrade (LP: #1254034) |
675 | + |
676 | + -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 12:08:23 -0500 |
677 | + |
678 | +maas (1.5+bzr1909-0ubuntu1) trusty; urgency=low |
679 | + |
680 | + * New upstream release. |
681 | + |
682 | + [ Dustin Kirkland ] |
683 | + * debian/maas-region-controller-min.postinst: Fix typo in sed. Remove |
684 | + double quotes. (LP: #1274448) |
685 | + |
686 | + [ Andres Rodriguez ] |
687 | + * debian/control: Add depends on python-crochet. |
688 | + * Get rid of dfsg on the versioning as we no longer strip any code from |
689 | + the orig tarball. |
690 | + - debian/rules: Do not strip any files out of the tarball. |
691 | + * debian/patches/*: Refreshed. |
692 | + |
693 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 31 Jan 2014 09:38:51 -0500 |
694 | + |
695 | +maas (1.4+bzr1853+dfsg-0ubuntu1) trusty; urgency=low |
696 | + |
697 | + * New upstream release |
698 | + |
699 | + -- Dustin Kirkland <kirkland@ubuntu.com> Tue, 28 Jan 2014 08:41:41 +0000 |
700 | + |
701 | +maas (1.4+bzr1849+dfsg-0ubuntu1) trusty; urgency=low |
702 | + |
703 | + * New upstream release. |
704 | + |
705 | + [ Gavin Panella ] |
706 | + * debian/control: Remove all dependencies on Avahi and DBUS. |
707 | + |
708 | + -- Julian Edwards <julian.edwards@canonical.com> Tue, 28 Jan 2014 17:12:22 +1000 |
709 | + |
710 | +maas (1.4+bzr1820+dfsg-0ubuntu1) trusty; urgency=low |
711 | + |
712 | + * New upstream Release. |
713 | + |
714 | + [ Jeroen Vermeulen ] |
715 | + * Move maas-probe-dhcp from maas-dhcp to python-maas-provisioningserver. |
716 | + |
717 | + [ Andres Rodriguez ] |
718 | + * debian/maas-region-controller.postinst: Make sure maas-txlongpoll and |
719 | + maas-region-celery get restarted. |
720 | + * debian/control: |
721 | + - python-maas-provisioningserver Breaks/Replaces for maas-dhcp due to |
722 | + moving files around packages. |
723 | + - Suggests ipmitool, libvirt-bin, amtterm. |
724 | + |
725 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 15 Jan 2014 00:24:58 -0500 |
726 | + |
727 | +maas (1.4+bzr1817+dfsg-0ubuntu1) trusty; urgency=low |
728 | + |
729 | + * New upstream release |
730 | + |
731 | + [ Andres Rodriguez ] |
732 | + * debian/maas-dns.postinst: Drop write_dns_config as this is run by |
733 | + celery jobs. |
734 | + * debian/maas-region-controller.templates: Rename template to |
735 | + maas-region-controller-min.templates |
736 | + * debian/control: Depends on python-amqp; Conflicts on python-librabbitmq. |
737 | + |
738 | + [ Julian Edwards ] |
739 | + * New maas-probe-dhcp script to detect DHCP servers |
740 | + - debian/extras/maas-probe-dhcp: New script |
741 | + - debian/maas-dhcp.install: Install new maas-probe-dhcp script |
742 | + - maas-dhcp.lintian-overrides: New maas-probe-dhcp script has no manpage |
743 | + |
744 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 15 Jan 2014 00:23:44 -0500 |
745 | + |
746 | +maas (1.4+bzr1789+dfsg-0ubuntu1) trusty; urgency=low |
747 | + |
748 | + * New upstream release |
749 | + |
750 | + [ Jeroen Vermeulen ] |
751 | + * Keep legacy import_ephemerals config for now. |
752 | + |
753 | + [ Andres Rodriguez ] |
754 | + * debian/maas-region-controller.postinst: Allo default-maas-url debconf |
755 | + option to be preseeded. |
756 | + * Make use of authbind to allow maas-cluster-celery bind port as non-root. |
757 | + - debian/control: Depends on authbind for maas-cluster-controller. |
758 | + - debian/maas-cluster-controller.{postinst,postrm}: Handle creation |
759 | + and removal of required authbind file. |
760 | + * Split maas-region-controller into maas-region-controller-min. |
761 | + - debian/maas-region-controller-min.{postinst,postrm,prerm}: Handle |
762 | + basic configuration for rsyslogd, squid-deb-proxy, and maas-url. |
763 | + - debian/control: Depends on maas-region-controller-min, postgresql |
764 | + and rabbitmq-server for maas-region-controller. |
765 | + |
766 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 10 Oct 2013 17:07:51 -0400 |
767 | + |
768 | +maas (1.4+bzr1693+dfsg-0ubuntu1) saucy; urgency=low |
769 | + |
770 | + * New Upstream Release (LP: #1218526) |
771 | + - This new upstream release contains fixes and improvements of the |
772 | + features approved by the FFe above. |
773 | + - Fixes commissioning failure on Saucy with 'Failed Test' (LP: #1237364) |
774 | + - Fixes access of static images over http (LP: #1236544) |
775 | + * d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544) |
776 | + * d/control: Bump depends on python-django to 1.4. (LP: #1236572) |
777 | + * d/maas-dhcp.postinst: Fail gracefully if apparmor_parser fails, allowing |
778 | + to install maas-dhcp during an ISO install. (LP: #1236786) |
779 | + |
780 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 04 Oct 2013 12:33:05 -0400 |
781 | + |
782 | +maas (1.4+bzr1656+dfsg-0ubuntu2) saucy; urgency=low |
783 | + |
784 | + * debian/control: Recommends on maas-dns instead of Depends for region |
785 | + because maas-dns needs the region installed first. |
786 | + |
787 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 03 Oct 2013 10:36:20 -0400 |
788 | + |
789 | +maas (1.4+bzr1656+dfsg-0ubuntu1) saucy; urgency=low |
790 | + |
791 | + [ Andres Rodriguez ] |
792 | + * New upstream bugfix release. |
793 | + - Respect filters for ephemerals_script.py. |
794 | + * debian/control: Depends on ubuntu-cloudimage-keyring instead of |
795 | + ubuntu-cloud-keyring; depends on python-distro-info. |
796 | + * debian/control: Remove suggests on maas-dhcp and maas-dns as they are |
797 | + now dependencies. |
798 | + |
799 | + [ Scott Moser ] |
800 | + * debian/control: Bump depends on isc-dhcp-server to 4.2.4 |
801 | + * debian/maas-dhcp.maas-dhcp-server.upstart: Change ownership of leases |
802 | + file to root:root, and run the daemon as dhcpd:dhcpd. |
803 | + |
804 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 01 Oct 2013 15:26:34 -0400 |
805 | + |
806 | +maas (1.4+bzr1655+dfsg-0ubuntu1) saucy; urgency=low |
807 | + |
808 | + * New Upstream release. (LP: #1218526) |
809 | + * debian/control: |
810 | + - Depends on python-djorm-ext-pgarray, python-curtin, |
811 | + python-simplestreams, ubuntu-cloud-keyring. |
812 | + - Depends on maas-dns, maas-dhcp to get them seeded and |
813 | + into main (LP: #1227353) |
814 | + |
815 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 28 Aug 2013 11:17:44 -0400 |
816 | + |
817 | +maas (1.4+bzr1551+dfsg-0ubuntu1) saucy; urgency=low |
818 | + |
819 | + * New upstream release |
820 | + |
821 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Aug 2013 16:20:41 -0400 |
822 | + |
823 | +maas (1.4+bzr1548+dfsg-0ubuntu1) saucy; urgency=low |
824 | + |
825 | + * New upstream release |
826 | + |
827 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 18 Jul 2013 10:15:10 -0400 |
828 | + |
829 | +maas (1.4+bzr1539+dfsg-0ubuntu1) saucy; urgency=low |
830 | + |
831 | + * New upstream release |
832 | + * Symlink apache2 config into /etc/apache2/conf-enabled/ instead of |
833 | + /etc/apache2/conf.d as apache2.4 no longer supports the latter. |
834 | + - debian/maas-cluster-controller.{postinst,postrm} |
835 | + - debian/maas-region-controller.{postinst,postrm} |
836 | + * debian/control: Bump Standards-Version to 3.9.4. |
837 | + * debian/maas-cluster-controller.lintian-overrides: Remove unneeded |
838 | + override and add a new one. |
839 | + * debian/maas-region-controller.lintian-overrides: Add extra overrides. |
840 | + |
841 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 03 Jul 2013 17:11:02 -0400 |
842 | + |
843 | +maas (1.4+bzr1538+dfsg-0ubuntu1) saucy; urgency=low |
844 | + |
845 | + * New upstream release |
846 | + * debian/patches/04-setup-dont-user-list-snippets.patch: Drop. Merged |
847 | + Upstream. |
848 | + |
849 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 13 Jun 2013 20:06:35 -0400 |
850 | + |
851 | +maas (1.4+bzr1527+dfsg-0ubuntu1) saucy; urgency=low |
852 | + |
853 | + * debian/patches/04-setup-dont-user-list-snippets.patch: Drop importing |
854 | + maasserver modules to list snippets in favor to using glob. Otherwise |
855 | + we would have to add various non necessary Build-Dependencies. |
856 | + |
857 | + [ Jeroen Vermeulen ] |
858 | + * Install templates into /etc/maas/templates/. |
859 | + |
860 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 03 Jun 2013 17:59:31 -0400 |
861 | + |
862 | +maas (1.4+bzr1505+dfsg-0ubuntu1) saucy; urgency=low |
863 | + |
864 | + * New upstream release |
865 | + |
866 | + [ Steve Langasek ] |
867 | + * Add missing dependency on iproute to maas-region-controller, for use of |
868 | + /sbin/ip in postinst. |
869 | + |
870 | + [ Julian Edwards ] |
871 | + * debian/maas-dhcp.maas-dhcp-server.upstart: |
872 | + - Detect 12.04 as the host OS and install with correct permissions. This |
873 | + allows the same packaging to be used in the 12.04 backport. |
874 | + |
875 | + [ Andres Rodriguez ] |
876 | + * Update packaging to support FPI: |
877 | + - debian/control: Depends on apache2 for maas-cluster-controller. |
878 | + - debian/maas-cluster-controller.install: Install http config file. |
879 | + - debian/maas-cluster-controller.{postinst,postrm}: Handle symlink creation |
880 | + and deletion. |
881 | + * debian/maas-region-controller.install: Install preseeds in |
882 | + etc/maas/preseeds. (LP: #1073463) |
883 | + |
884 | + [ Jeroen Vermeulen ] |
885 | + * In the source tree, /etc/maas/pserv.yaml has moved from etc/ to etc/maas/. |
886 | + * Install templates into /etc/maas/templates/. |
887 | + |
888 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 03 Jun 2013 16:53:14 -0400 |
889 | + |
890 | +maas (1.3+bzr1455+dfsg-0ubuntu1) raring; urgency=low |
891 | + |
892 | + * New upstream bugfix release. |
893 | + - Fixes and returns the 'resource_url' with the 'canonical' url for |
894 | + a file that is fetched using the API (LP: #1154142) |
895 | + |
896 | + [ Andres Rodriguez ] |
897 | + * debian/control: |
898 | + - Change Conflicts/Replaces for Breaks/Replaces. |
899 | + - Conflicts on tftpd-hpa and dnsmasq. |
900 | + - Do not pre-depends, but Depends on ${misc:Depends} for 'maas'. |
901 | + |
902 | + [ Steve Langasek ] |
903 | + * postinst scripts are never called with 'reconfigure' as the script |
904 | + argument. Remove references to this (mythical) invocation. |
905 | + * always call 'set -e' from maintainer scripts instead of passing 'sh -e' |
906 | + as the interpreter, so that scripts will behave correctly when run via |
907 | + 'sh -x'. |
908 | + * invoke-rc.d is never allowed to not exist - simplify scripts (and make |
909 | + them better policy-compliant) by invoking unconditionally. (The only |
910 | + possible exception is in the postrm, where it's *theoretically* possible |
911 | + for invoke-rc.d to be missing if the user has completely stripped |
912 | + down their system; that's a fairly unreasonable corner case, but we |
913 | + might as well be correct if it ever happens.) |
914 | + * db_get+db_set is a no-op; don't call db_set to push back a value we just |
915 | + got from db_get. |
916 | + * Omit superfluous calls to 'exit 0' at the end of each script. |
917 | + * Remove maas-cluster-controller prerm script, which called debconf for no |
918 | + reason. |
919 | + * Don't invoke debconf in the postrm script either, debhelper already does |
920 | + this for us. |
921 | + * Other miscellaneous maintainer script fixes |
922 | + * debian/maas-common.postinst: call adduser and addgroup unconditionally; |
923 | + the tools are already designed to DTRT, we don't need to check for the |
924 | + user/group existence before calling them nor should we worry about |
925 | + calling them only once on first install. |
926 | + * debian/maas-common.postrm: delete the maas group, not just the user, |
927 | + as the comment in the code implies we should do. |
928 | + |
929 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 19 Mar 2013 15:38:22 -0400 |
930 | + |
931 | +maas (1.3+bzr1452+dfsg-0ubuntu1) raring; urgency=low |
932 | + |
933 | + * New upstream release. |
934 | + - MAAS file storage mechanism is shifting from a single shared |
935 | + namespace to a per-user namespace. Operators of the majority |
936 | + of MAAS systems will not notice any change. However, operators |
937 | + of the most complex installations may find that a new |
938 | + "shared-environment" user is created, and that some resources |
939 | + are reassigned to it, such as API credentials and SSH public |
940 | + keys. This provides a transitional environment that mimics the |
941 | + behaviour of a shared namespace. |
942 | + |
943 | + [ Raphaël Badin ] |
944 | + * debian/control: maas-region-controller depends on bind9utils. |
945 | + (LP: #1103195) |
946 | + * debian/maas-dns.postinst: Call write_dns_config. |
947 | + (LP: #1085865). |
948 | + * debian/maas-cluster-controller.postinst: Fix the name of the config |
949 | + file (/etc/maas/pserv.yaml and not /etc/maas/pserv.conf) |
950 | + (LP: #1083542). |
951 | + * debian/extras/99-maas-sudoers: Add 'SETENV:' to sudo rule |
952 | + to allow preserving the environment when running |
953 | + /usr/sbin/maas-import-pxe-files via sudo. |
954 | + * debian/maas-dns.postinst: fix permissions and group ownership of |
955 | + file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935) |
956 | + * debian/control: Remove the dependency of maas-cluster-controller |
957 | + on rabbitmq-server. (LP: #1072744) |
958 | + * debian/extras/99-maas-sudoers: Add sudo rule for script |
959 | + /usr/sbin/maas-import-pxe-files. |
960 | + * debian/maas-cluster-controller.install: Removed commissioning-user-data |
961 | + script. |
962 | + |
963 | + [ Julian Edwards ] |
964 | + * debian/maas-region-controller.install: Remove installation of maas-gc; it |
965 | + is no longer required as upstream no longer stores files in the filesystem. |
966 | + (LP: #1069734) |
967 | + * debian/maas-cluster-controller.postinst: Ensure that /etc/maas/pserv.yaml |
968 | + is updated when reconfiguring. (LP: #1081212) |
969 | + |
970 | + [ Jeroen Vermeulen ] |
971 | + * debian/maas-cluster-controller.install: Install import scripts. |
972 | + * debian/maas-cluster-controller.postinst: Configure tgt (the iSCSI server) |
973 | + so the import script can install files to it. |
974 | + * debian/maas-cluster-controller.postrm: Clean up tgt config. |
975 | + * debian/maas-region-controller.install: Move import scripts out to the |
976 | + cluster controller, and drop the maas-import-isos compatibility script. |
977 | + * debian/maas-region-controller.postinst: Remove tgt config. |
978 | + * debian/maas-region-controller.postrm: Remove tgt config cleanup. |
979 | + * Bump code revision to include latest user_data.template fixes. |
980 | + |
981 | + [ Gavin Panella ] |
982 | + * debian/extras/99-maas: squashfs image download is no longer needed. |
983 | + * debian/maas-cluster-controller.install: maas-import-squashfs and its |
984 | + configuration file are no longer part of upstream. |
985 | + * debian/maas-cluster-controller.install: The maas-import-pxe-files cron |
986 | + task is no longer used. |
987 | + * debian/maas-cluster-controller.postinst: Remove leading comment |
988 | + markers from the 'generator' line in pserv.yaml. |
989 | + |
990 | + [ Andres Rodriguez ] |
991 | + * debian/control: |
992 | + - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028) |
993 | + - maas-dns: Conflicts with dnsmasq |
994 | + - maas-cluster-controller Conflicts/Replaces maas-region-controller as |
995 | + import scripts are no longer shipped in the region. |
996 | + - debian/control: Depends on distro-info for maas-cluster-controller |
997 | + instead of maas-region-controller (LP: #1103194) |
998 | + * debian/maas-cluster-controller.config: If URL has been detected, |
999 | + add /MAAS if it doesn't contain it. This helps upgrades from versions |
1000 | + where DEFAULT_MAAS_URL didn't use /MAAS. |
1001 | + |
1002 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 04 Mar 2013 11:49:44 -0500 |
1003 | + |
1004 | +maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low |
1005 | + |
1006 | + * New upstream bugfix release |
1007 | + - Fixes commissioning failing to set memory attribute. (LP: #1064638) |
1008 | + - Fixes node listing by adding pagination (LP: #1064672) |
1009 | + - Changes default bind rndc key which breaks initscripts (LP: #1066938) |
1010 | + - Fixes invalid DNS config once node is enlisted (LP: #1066958) |
1011 | + - Reference documentation link to correct URL (LP: #1067261) |
1012 | + |
1013 | + [ Andres Rodriguez ] |
1014 | + * debian/rules: Change upstream branch. |
1015 | + |
1016 | + [ Gavin Panella ] |
1017 | + * debian/maas-dns.postinst: Remove MAAS-related include lines from named's |
1018 | + config before adding a new one (LP: #1066929) |
1019 | + |
1020 | + [ Raphael Badin ] |
1021 | + * debian/extras/maas-region-celeryd: Remove whitespace that affects DNS |
1022 | + rabbitmq queue. (LP: #1067929) |
1023 | + |
1024 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 16 Oct 2012 10:31:37 -0400 |
1025 | + |
1026 | +maas (0.1+bzr1264+dfsg-0ubuntu2) quantal; urgency=low |
1027 | + |
1028 | + * Fix MAAS not working after CD/preseed install (LP: #1065763) |
1029 | + - debian/extras/maas-region-celeryd: Add wrapper to run celery from |
1030 | + the upstart job. |
1031 | + - debian/extras/maas-region-controller.maas-region-celery.upstart: Create |
1032 | + rabbitmq user if it does not exists. |
1033 | + * debian/control: Remove unneeded deps on python-txtftp for some binary pkgs. |
1034 | + * debian/maas-region-controller.postinst: Minor fix referencing variable. |
1035 | + |
1036 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 11 Oct 2012 17:38:08 -0400 |
1037 | + |
1038 | +maas (0.1+bzr1264+dfsg-0ubuntu1) quantal; urgency=low |
1039 | + |
1040 | + * New upstream release. |
1041 | + |
1042 | + [ Raphaël Badin ] |
1043 | + * debian/maas-region-controller.postinst: Enable proxy_http module. |
1044 | + * debian/maas-cluster-controller.postinst: Create /var/lib/maas. (LP: #1065062) |
1045 | + |
1046 | + [ Andres Rodriguez ] |
1047 | + * Install maas-provision with python-maas-provisioningserver (LP: #1065171): |
1048 | + - debian/python-maas-provisioningserver.install: Install |
1049 | + - debian/control: Add Conflicts/Replaces with maas-cluster-controller |
1050 | + to handle upgrades. |
1051 | + * debian/patches/04-fix-ipmi-enlistment.patch: Drop. Merged Upstream. |
1052 | + * debian/control: Depends on maas-region-controller for maas-dns. |
1053 | + * debian/maas-region-controller.postinst: Set the correct host for |
1054 | + BROKER_URL (LP: #1065080) |
1055 | + * Handle creation of user/group in maas-common. |
1056 | + * debian/maas-region-controller.config: Always source dbconfig scripts. |
1057 | + |
1058 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Oct 2012 11:17:21 -0400 |
1059 | + |
1060 | +maas (0.1+bzr1243+dfsg-0ubuntu3) quantal; urgency=low |
1061 | + |
1062 | + * 04-fix-ipmi-enlistment.patch: retry maas-enlist without power parameters |
1063 | + on failure. This allows enlistment to continue working with Precise |
1064 | + ephemeral images before the Precise SRU for maas-enlist lands. |
1065 | + (LP: #1064922). |
1066 | + |
1067 | + -- Robie Basak <robie.basak@canonical.com> Wed, 10 Oct 2012 13:29:16 +0000 |
1068 | + |
1069 | +maas (0.1+bzr1243+dfsg-0ubuntu2) quantal; urgency=low |
1070 | + |
1071 | + * debian/patches/99-ipmi-user-too-long.patch: Fix username too long for |
1072 | + IPMI user created on enlistment (LP: #1064832) |
1073 | + |
1074 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Oct 2012 01:00:29 -0400 |
1075 | + |
1076 | +maas (0.1+bzr1243+dfsg-0ubuntu1) quantal; urgency=low |
1077 | + |
1078 | + * New upstream release. (LP: #1064596) |
1079 | + * debian/patches/99-temporary-fix-constraints.patch: Dropped. |
1080 | + * debian/control: |
1081 | + - ${python:Depends} for maas-common. |
1082 | + - Add missing Depends for python-maas-provisioningserver (LP: #1064542) |
1083 | + * debian/maas-cluster-controller.postinst: Create /var/log/maas if it |
1084 | + doesn't exist (LP: #1064539) |
1085 | + |
1086 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 08 Oct 2012 17:02:56 -0400 |
1087 | + |
1088 | +maas (0.1+bzr1223+dfsg-0ubuntu1) quantal; urgency=low |
1089 | + |
1090 | + * New upstream release. (LP: #1062518) |
1091 | + |
1092 | + [ Julian Edwards ] |
1093 | + * Split packaging of 'maas' into maas-{region,cluster}-controller |
1094 | + - debian/control: Update accordingly. |
1095 | + - debian/*.install: Move files accordingly |
1096 | + - debian/*.{postinst,postrm,preinst}: Move files accordingly. |
1097 | + * Ensure isc-dhcp-server is disabled when installing maas-dhcp. |
1098 | + * Ensure maas-dns creates the maas user before trying to chown files. |
1099 | + * Make maas-cluster-controller autoconfigure itself when upgrading from the |
1100 | + old maas package. (LP: #1059416) |
1101 | + * Add missing prerm file for maas-cluster-controller so that .pyc files |
1102 | + are cleaned up. (LP: #1059973) |
1103 | + |
1104 | + [ Raphaël Badin ] |
1105 | + * Install maas_local_celeryconfig.py in /etc/maas and symlink to |
1106 | + /usr/share/maas. |
1107 | + * debian/maas.postinst: Create rabbitmq celery user/vhost. |
1108 | + * debian/maas.postinst: Update BROKER_URL in maas_local_celeryconfig.py. |
1109 | + * Use maas_local_celeryconfig_cluster.py as the local celery |
1110 | + configuration file for the cluster worker. |
1111 | + * debian/maas-region-controller.maas-region-celery.upstart: Add region |
1112 | + worker upstart script. |
1113 | + * Rename cluster worker upstart script into |
1114 | + maas-cluster-controller.maas-clluster-celery.upstart. |
1115 | + * maas-cluster-controller.maas-celery.upstart: use "celeryconfig_cluster" |
1116 | + as the Celery config module. |
1117 | + * debian/maas-common.install: Install celeryconfig_common.py. |
1118 | + * debian/maas-cluster-controller.install: Install celeryconfig_cluster.py. |
1119 | + * debian/maas-region-controller.install: Install celeryconfig.py. |
1120 | + * Split celery config into cluster and region configs. |
1121 | + * Add region celeryd upstart config. |
1122 | + * Define CELERY_CONFIG_MODULE in |
1123 | + maas-cluster-controller.maas-cluster-celery.upstart |
1124 | + |
1125 | + [ Jeroen Vermeulen ] |
1126 | + * Make maas_local_celery_config.py non-world readable. |
1127 | + * Make maas_local_celeryconfig_cluster.py non-world readable. |
1128 | + * Set root:maas ownership of local cluster config only *after* |
1129 | + the maas user/group have been created |
1130 | + |
1131 | + [ Andres Rodriguez ] |
1132 | + * debian/maas.postinst: |
1133 | + - Always restart apache2. |
1134 | + - Handle upgrades for new upstream release. |
1135 | + - Handle upgrades for celery rabbitmq worker. |
1136 | + * Add binary package to install client tool. |
1137 | + - debian/extras/maas-cli: Add binary. |
1138 | + - debian/maas-cli.install: Add. Install maascli and apiclient. |
1139 | + - debian/control: Add binary package. |
1140 | + * debian/control: |
1141 | + - Depends on freeipmi-tools instead of ipmitool. |
1142 | + - Conflicts/Replaces on maas for python-maas-client. |
1143 | + - Depends on python-netifaces, python-lxml. |
1144 | + * Add python-maas-client binary package: |
1145 | + - debian/python-maas-client.install: Add. Install 'apiclient' python module. |
1146 | + - debian/control: Add package. python-django-maas and maas-cli now |
1147 | + Depend on it. |
1148 | + * debian/rules: Install maas-dhcp-server upstart job. |
1149 | + * debian/maas.postrm: Remove celery worker rabbitmq user and host. |
1150 | + * debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job |
1151 | + instead of isc-dhcp-server (LP: #1055951) |
1152 | + * debian/maas-region-controller.postinst: Cleanup upgrade rules. |
1153 | + * debian/maas-cluster-controller.postinst: Fix 'local' usage. |
1154 | + * debian/maas-common.install: Install celeryconfig in appropriate location. |
1155 | + * debian/maas-cluster-controller.postrm: Add and delete maas user. |
1156 | + * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server. |
1157 | + * debian/maas-region-controller.postinst: |
1158 | + - Always update passwords on upgrade. No longer check versioning. (LP: #1060094). |
1159 | + - Add MAAS server to allowed mirror in squid-deb-proxy |
1160 | + - Source dbconfig conf file for maas-region-controller on upgrade because |
1161 | + it writes a new config file and no longer preservers the previous password. |
1162 | + * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}. |
1163 | + * debian/maas-region-controller.install: Install maas-import-squashfs |
1164 | + * Handle removal of non existant files (LP: #1059556): |
1165 | + - debian/maintscript: Added to handle removal of conffiles. |
1166 | + - debian/control: Add Pre-depends and bump debhelper version. |
1167 | + * update po files for the templates. |
1168 | + * debian/extras/99-maas: Install in usr/share/maas/conf and symlink to the |
1169 | + appropriate etc dir. |
1170 | + * debian/maas-cluster-controller.config: Source debconf at the beginning of the |
1171 | + script. (LP: #1063857) |
1172 | + * debian/patches/99-temporary-fix-constraints.patch: Fix constraints maaping |
1173 | + when deploying with juju. Temporary until it gets merged upstream |
1174 | + |
1175 | + [ Robie Basak ] |
1176 | + * Add maas-cluster-controller dependency on uuid-runtime, needed for uuidgen |
1177 | + by postinst. |
1178 | + |
1179 | + [ Scott Moser ] |
1180 | + * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into |
1181 | + /etc/apparmor.d/dhcpd.d (LP: #1049177), and update apparmor profile for |
1182 | + /usr/sbin/dhcpd on install/remove |
1183 | + * get the ip address for the dhcp server in config |
1184 | + |
1185 | + [ Diogo Matsubara ] |
1186 | + * Add initial tests to be run by autotests: |
1187 | + - debian/control: XS-Testsuite: autopkgtest |
1188 | + - debian/tests/control: Add |
1189 | + - debian/tests/maas-package-test: Add |
1190 | + - tests/maas-integration.py: Add |
1191 | + |
1192 | + -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 08 Oct 2012 13:10:23 -0400 |
1193 | + |
1194 | +maas (0.1+bzr971+dfsg-0ubuntu2) quantal; urgency=low |
1195 | + |
1196 | + * debian/extras/99-maas-sudoers: Add missing rule for |
1197 | + maas-provision. (LP: #1046397) |
1198 | + |
1199 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 05 Sep 2012 12:36:58 -0400 |
1200 | + |
1201 | +maas (0.1+bzr971+dfsg-0ubuntu1) quantal; urgency=low |
1202 | + |
1203 | + * New upstream release (LP: #1044367) |
1204 | + |
1205 | + [ Julian Edwards ] |
1206 | + * Fix 02-pserv-config.patch to handle new default tftp directory |
1207 | + |
1208 | + [ Andres Rodriguez ] |
1209 | + * debian/maas.postinst: |
1210 | + - include '/MAAS' for DEFAULT_MAAS_URL.(LP: #1033956) |
1211 | + - Update bzr version to safely upgrade. |
1212 | + * Add maas-dns package that configures DNS in MAAS (LP: #1030860) |
1213 | + * Remove cobbler related bits |
1214 | + - debian/maas.postinst: Drop cobbler configuration |
1215 | + - debian/maas.install: Drop installation of snippets/preseeds. |
1216 | + - debian/control: |
1217 | + + Drop Depends on maas-provision. (LP: #975473) |
1218 | + + Depends on bind9utils. |
1219 | + + Depends on python-lockfile (LP: #1037400) |
1220 | + Add necessary Conflicts/Replaces. Add conflicts to tftpd-hpa and dnsmasq. |
1221 | + Depends on isc-dhcp-server for maas-dhcp, and syslinux-common. |
1222 | + - debian/extras/maas-provision: Add missing "$@" (LP: #1040462) |
1223 | + - debian/patches: |
1224 | + + 02-pserv-config.patch: Updated. Do not patch cobbler related bits. |
1225 | + patch tftp config to default. |
1226 | + * maas-dhcp: Re-add to handle initial configuration of MAAS DHCP server. |
1227 | + * Allow restart of 'isc-dhcp-server' by adding a sudoers file: |
1228 | + - debian/extras/99-maas-sudoers: Added. |
1229 | + - debian/maas.install: Install 99-maas-sudoers |
1230 | + * Minor improvements on dbconfig-common handling: |
1231 | + - debian/maas.config: Only call dbc_go when scripts present. |
1232 | + - debian/maas.postrm: Only call dbc_go when config file exists. |
1233 | + * debian/maas.maas-celery.upstart: Enable Beat and set scheduler db file. |
1234 | + * debian/maas-dns.postinst: Set correct permissions. (LP: #1042868) |
1235 | + * debian/maas-dhcp.config: |
1236 | + - Ask whether we want to enable DHCP (LP: #1044229) |
1237 | + - Add debconf question for network interfaces |
1238 | + * debian/maas.prerm: Stop services before removing database (LP: #1044559) |
1239 | + |
1240 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 02 Aug 2012 09:01:43 -0400 |
1241 | + |
1242 | +maas (0.1+bzr777+dfsg-0ubuntu1) quantal-proposed; urgency=low |
1243 | + |
1244 | + * New upstream release |
1245 | + * Only run 'maas' command as root. (LP: #974046) |
1246 | + - debian/extras/maas: Check id. |
1247 | + - debian/maas.install: Install in 'sbin'. |
1248 | + * debian/maas.postinst: |
1249 | + - restart apache2 after everything gets processed. |
1250 | + - Update version to handle upgrades. |
1251 | + * debian/extras/maas-provision: Add wrapper to access 'maasprovisiong' |
1252 | + command line. |
1253 | + * debian/patches/99_temporary_fix_path.patch: Dropped. No longer needed. |
1254 | + |
1255 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Jul 2012 08:28:36 -0400 |
1256 | + |
1257 | +maas (0.1+bzr745+dfsg-0ubuntu2) quantal; urgency=low |
1258 | + |
1259 | + * debian/control: Build-Dep on python-django instead of |
1260 | + python-django-configglue |
1261 | + |
1262 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Jul 2012 08:24:25 -0400 |
1263 | + |
1264 | +maas (0.1+bzr745+dfsg-0ubuntu1) quantal; urgency=low |
1265 | + |
1266 | + * New Upstream Release |
1267 | + * debian/patches: |
1268 | + - 99_power_fixes.patch: Dropped. Merged Upstream. |
1269 | + - 99_enums_js.patch: Dropped. No longer needed. |
1270 | + * Automatically build enums.js: |
1271 | + - debian/control: Build-Depends on python-django-configglue |
1272 | + - debian/rules: Build and install enums.js. |
1273 | + * debian/maas.postinst: Update version to handle upgrades |
1274 | + |
1275 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 12 Jul 2012 16:34:11 -0400 |
1276 | + |
1277 | +maas (0.1+bzr740+dfsg-0ubuntu1) quantal; urgency=low |
1278 | + |
1279 | + * New upstream release |
1280 | + * debian/control: Depends on python-txtftp. |
1281 | + * debian/rules: Do not ship python-tx-tftp. |
1282 | + * debian/maas.postinst: Update version to upgrade successfully. |
1283 | + * debian/patches: |
1284 | + - 02-pserv-config.patch: Refreshed. |
1285 | + - 99_enums_js.patch: Updated. |
1286 | + - 99_power_fixes.patch: Added temporarily to enable IPMI |
1287 | + - 99_temporary_fix_path.patch: Added temporarily to not fail when |
1288 | + importing celeryconfig |
1289 | + |
1290 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Jul 2012 17:54:49 -0400 |
1291 | + |
1292 | +maas (0.1+bzr709+dfsg-0ubuntu1) quantal; urgency=low |
1293 | + |
1294 | + * New Upstream release |
1295 | + * debian/control: |
1296 | + - Depends on python-celery, python-tempita, libjs-yui3-{full,min}, |
1297 | + libjs-raphael |
1298 | + * debian/maas.install: |
1299 | + - Install apiclient, celeryconfig.py, maas-import-pxe-files, preseeds_v2. |
1300 | + - Update to install various files from chroot, rather tha manually copy |
1301 | + them from the source. |
1302 | + * debian/maas.links: symlink celeryconfig.py |
1303 | + * debian/maas.maas-celery.upstart: Add job. |
1304 | + * debian/rules: |
1305 | + - Install celery upstart job. |
1306 | + - Do not install jslibs as packages are now used. |
1307 | + - Drop copying of maas_local_settings_sample.py as source now ships |
1308 | + a maas_local_settings.py |
1309 | + * debian/patches: |
1310 | + - 04-maas-http-fix.patch: Drop. Merged upstream. |
1311 | + - 01-fix-database-settings.patch: Refreshed. |
1312 | + - 99_enums_js.patch: Added until creation of enum.js / build process |
1313 | + is fixed. |
1314 | + * debian/maas.postinst: Update bzr version to correctly handle upgrades. |
1315 | + |
1316 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Jul 2012 17:42:37 -0400 |
1317 | + |
1318 | +maas (0.1+bzr482+dfsg-0ubuntu1) precise; urgency=low |
1319 | + |
1320 | + * New upstream release (Fixes LP: #981103) |
1321 | + * debian/maas.postinst: |
1322 | + - Make sure rabbitmq and postgresql are started on upgrade (LP: #981282) |
1323 | + - Handle upgrades from any lower than 0.1+bzr462+dfsg-0ubuntu1 to |
1324 | + correctly re-generate passwords, and not have db sync/migrate issues |
1325 | + as config has changed upstream. |
1326 | + - Correctly set Passwords for PSERV, otherwise it won't set new passwords. |
1327 | + * Allow MAAS_DEFAULT_URL reconfiguration. (LP: #980970) |
1328 | + - debian/maas.config: Add reconfigure validation to correctly allow it, |
1329 | + and ask a question. |
1330 | + - debian/maas.postinst: Reconfigure DEFAULT_MAAS_URL as well as cobbler |
1331 | + server and next_server for PXE/Provisioning. |
1332 | + - debian/maas.templates: Add debconf question and update info. |
1333 | + * Do not lose MAAS_DEFAULT_URL settings on upgrade (LP: #984309) |
1334 | + * debian/maas.postinst: |
1335 | + - Set cobbler password in between quotes (LP: #984427) |
1336 | + - Do not change permissions to maas.log (LP: #980915) |
1337 | + * no longer use maas-cloudimg2ephemeral, but rather use premade images |
1338 | + at http://maas.ubuntu.com |
1339 | + |
1340 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Apr 2012 23:44:46 -0700 |
1341 | + |
1342 | +maas (0.1+bzr462+dfsg-0ubuntu1) precise; urgency=low |
1343 | + |
1344 | + * New upstream release (LP: #980240) |
1345 | + |
1346 | + [ Scott Moser ] |
1347 | + * add dependency on distro-info (LP: #949442) |
1348 | + * debian/control: add dependency on tgt for ephemeral iscsi environment |
1349 | + |
1350 | + [ Andres Rodriguez ] |
1351 | + * Make package lintian clean: |
1352 | + - maas{-dhcp}.lintian-overrides: Add to make lintian clean. |
1353 | + - debian/control: Add missing dependencies; correct section and desc. |
1354 | + - debian/maas.postinst: Do not use absolute path for rabbitmqctl. |
1355 | + - debian/patches: Add headers to all patches. |
1356 | + * debian/maas-dhcp.postrm: Added to disable dnsmasq in cobbler on removal. |
1357 | + * debian/maas.config: Do not set a password with pwgen as it is not an |
1358 | + essential package; allow dbconfig-common to create a password instead by |
1359 | + creating an empty question. (LP: #977475) |
1360 | + * Run MAAS, pserv, txlongpoll as non-root user. (LP: #975436) |
1361 | + - debian/maas.postinst: Create user/group; set correct permissions for |
1362 | + directories. |
1363 | + - debian/maas.postrm: Remove user/group; restart apache2. |
1364 | + - debian/maas.maas-{pserv,txlongpoll}.upstart: Update to run as non-root |
1365 | + 'maas' user. |
1366 | + * debian/patches/01-fix-database-settings.patch: Remove adding of PSERV_URL. |
1367 | + * debian/maas.postinst: |
1368 | + - Handle config file upgrade from versions lower than 0.1+bzr445+dfsg-0ubuntu1, |
1369 | + by creating new passwords and updating accordingly |
1370 | + - use local variables in functions. |
1371 | + - Handle maas tgt configuration for upgrades from 0.1+bzr459+dfsg-0ubuntu1. |
1372 | + * debian/extras/99-maas: Add squid-deb-proxy file to enable PPAs. (LP: #979383) |
1373 | + * debian/maas.install: Install missing commissioning-user-data script. |
1374 | + |
1375 | + [ Dave Walker (Daviey) ] |
1376 | + * debian/patches/02-pserv-config.patch: Refreshed to apply to updated config. |
1377 | + |
1378 | + [ Gavin Panella ] |
1379 | + * debian/maas.postinst: Update pserv.yaml and maas_local_settings.py to use |
1380 | + password. |
1381 | + |
1382 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 12 Apr 2012 16:37:53 -0400 |
1383 | + |
1384 | +maas (0.1+bzr415+dfsg-0ubuntu2) precise; urgency=low |
1385 | + |
1386 | + * debian/maas-dhcp.{config,postinst}: |
1387 | + - Fix not setting new values on fresh install. (LP: #975321) |
1388 | + - Fix unsetting domain, otherwise, even if disabled, it will always be set. |
1389 | + * debian/control: Depends on maas for maas-dhcp. |
1390 | + |
1391 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 06 Apr 2012 15:30:44 -0400 |
1392 | + |
1393 | +maas (0.1+bzr415+dfsg-0ubuntu1) precise; urgency=low |
1394 | + |
1395 | + * debian/control: Update package descriptions; Suggests maas-dhcp for maas |
1396 | + and add a maas-dhcp binary. |
1397 | + * Add maas-dhcp package to configure a DHCP server. |
1398 | + - debian/maas-dhcp.config: Add to ask debconf questions about range, |
1399 | + gateway, and domain. |
1400 | + - debian/maas-dhcp.postinst: Handle update of config values. |
1401 | + - debian/maas-dhcp.templates: Debconf questions. |
1402 | + * debian/po: Update for templates. |
1403 | + * Add message telling MAAS URL after installation. |
1404 | + - debian/maas.templates: Add message. |
1405 | + - debian/maas.postinst: Display message. |
1406 | + * debian/maas.config: Hide dbconfig-install question. |
1407 | + |
1408 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 04 Apr 2012 14:47:13 -0400 |
1409 | + |
1410 | +maas (0.1+bzr400+dfsg-0ubuntu1) precise; urgency=low |
1411 | + |
1412 | + * debian/patches/{02-pserv-config,03-txlongpoll-config}.patch: Refreshed. |
1413 | + * debian/maas.install: Install maas-gc cronjob. |
1414 | + * Add apport hook. |
1415 | + - debian/maas.apport: Add hook. |
1416 | + - debian/rules: Install with apport. |
1417 | + * debian/maas.logrotate: Add logrotate for txlongpoll and pserv logs. |
1418 | + * Create 'var/lib/media/maas/storage' on postinst to have right permissions. |
1419 | + - debian/maas.dirs: Drop dir creation. |
1420 | + - debian/maas.postinst: Create dir with correct permissions. |
1421 | + - debian/maas.postrm: Remove dir on purge. |
1422 | + |
1423 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Apr 2012 14:50:34 -0400 |
1424 | + |
1425 | +maas (0.1+bzr378+dfsg-0ubuntu1) precise; urgency=low |
1426 | + |
1427 | + * maas.dirs: Create var/lib/maas/media/storage for juju storage. |
1428 | + * maas.postinst: |
1429 | + - Give correct permissions to above dir. |
1430 | + - stop apache2 before db upgrade, and restart after. |
1431 | + |
1432 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 29 Mar 2012 19:28:13 -0400 |
1433 | + |
1434 | +maas (0.1+bzr363+dfsg-0ubuntu1) precise; urgency=low |
1435 | + |
1436 | + [ Dave Walker (Daviey) ] |
1437 | + * debian/control: Add openssh-server as a Recommends, and wrap-and-sort. |
1438 | + |
1439 | + [ Andres Rodriguez ] |
1440 | + * debian/maas.postinst: |
1441 | + - Do not start apache with apache2ctl. Use invoke-rc.d instead to not |
1442 | + fail in the installer. |
1443 | + - For start of postgresql before creating the DB, otherwise it will |
1444 | + fail in the installer. |
1445 | + - Add check of invoke-rc.d for syslog. |
1446 | + - Add check of invoke-rc.d for rabbitmq-server; Add check for rabbitmqctl |
1447 | + - Add db_stop, in case invoke-rc.d fails. |
1448 | + * debian/control: Tight python-django-maas dependency. |
1449 | + * debian/postrm: Add check for rabbitmqctl. |
1450 | + * debian/maas.maas-txlongpoll.upstart: Create rabbitmq longpoll user/vhost |
1451 | + and set permissions if they don't exist. Start on rabbitmq-server-running. |
1452 | + |
1453 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 27 Mar 2012 14:49:56 -0400 |
1454 | + |
1455 | +maas (0.1+bzr338+dfsg-0ubuntu1) precise; urgency=low |
1456 | + |
1457 | + [ Dave Walker (Daviey) ] |
1458 | + * d/patches/03-txlongpoll-config.patch: Resolve typo error from prior patch. |
1459 | + - LP: #961031 |
1460 | + |
1461 | + [ Andres Rodriguez ] |
1462 | + * debian/maas.config: Don't allow reconfigure. |
1463 | + * debian/maas.postinst: Don't allow reconfigure. Run sync/migrate db on |
1464 | + all upgrades. |
1465 | + |
1466 | + [ Scott Moser ] |
1467 | + * add rsylog config for logging node boots (LP: 960149) |
1468 | + |
1469 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 22 Mar 2012 10:56:58 -0400 |
1470 | + |
1471 | +maas (0.1+bzr315+dfsg-0ubuntu1) precise; urgency=low |
1472 | + |
1473 | + * New upstream snapshot. |
1474 | + |
1475 | + [ Dave Walker ] |
1476 | + * debian/maas.postinst: Do not import ISO's at install time. |
1477 | + * debian/control: |
1478 | + - Drop run-one, it's not a requirement and currently in universe. |
1479 | + - Drop python-setproctitle, no longer required. |
1480 | + |
1481 | + [ Andres Rodriguez ] |
1482 | + * debian/control: Depends on python-avahi, python-dbus, and avahi-daemon. |
1483 | + * debian/maas.postinst: |
1484 | + - Only syncdb if dbconfig db creation was selected. |
1485 | + - Set rabbitmq/longpoll settings |
1486 | + * debian/patches/03-txlongpoll-config.patch: Updated broker settings for |
1487 | + rabbitmq. |
1488 | + |
1489 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 20 Mar 2012 20:10:58 -0400 |
1490 | + |
1491 | +maas (0.1+bzr300+dfsg-0ubuntu1) precise; urgency=low |
1492 | + |
1493 | + * debian/patches: |
1494 | + - 01-fix-database-settings.patch: Update PSERV_URL port. |
1495 | + - 02-pserv-config.patch: Update, and set 'maas' as username. |
1496 | + - 03-longpoll-config.patch: Update. |
1497 | + * debian/maas.install: Install preseeds and snippets. |
1498 | + * debian/maas.postinst: |
1499 | + - Set password for 'maas' cobbler username (in pserv and cobbler). |
1500 | + - Set DEFAULT_MAAS_URL to IP of interface with default gateway. |
1501 | + |
1502 | + -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 16 Mar 2012 14:59:16 -0400 |
1503 | + |
1504 | +maas (0.1+bzr295+dfsg-0ubuntu2) precise; urgency=low |
1505 | + |
1506 | + * debian/patches: |
1507 | + - 01-fix-database-settings.patch: Update to set PSERV_URL. |
1508 | + - 02-pserv-config.patch: Set port to 8001. |
1509 | + * debian/maas.postinst: Run maas-import-isos on install. |
1510 | + * debian/control: Depends on rabbitmq-server. |
1511 | + |
1512 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Mar 2012 18:14:08 -0400 |
1513 | + |
1514 | +maas (0.1+bzr295+dfsg-0ubuntu1) precise; urgency=low |
1515 | + |
1516 | + * debian/maas.upstart: Specify pidfile and conffile. |
1517 | + * debian/maas.postinst: |
1518 | + - Only run syncdb if dbconfig postinst file exists. |
1519 | + - Fix file permissions. |
1520 | + * debian/maas.{postrm,prerm}: Add dbconfig-common support. |
1521 | + * Add txlongpoll support for packaging: |
1522 | + - debian/control: Depends on python-txlongpoll. |
1523 | + - debian/maas.maas-longpoll.upstart: Added to start txlongpoll. |
1524 | + - debian/maas.install: Install txlongpoll.yaml |
1525 | + * debian/extras/maas: Improvements. |
1526 | + * debian/maas.maas.upstart: Moved from debian/maas.upstart. |
1527 | + * debian/maas.postinst: Touch logfile to set correct permissions (LP: #955400) |
1528 | + * debian/maas.logrotate: Add. |
1529 | + * debian/patches/03-txlongpoll-config.patch: Add default settings. |
1530 | + * debian/maas.config: Only run dbconfig-common on configure/reconfigure. |
1531 | + * Install maas_local_settings.py in /etc/maas and symlink to usr/share/maas |
1532 | + * Update references from MaaS to MAAS. |
1533 | + * Remove podebconf as templates no longer exist. |
1534 | + - debian/po: Remove. |
1535 | + - debian/control: Drop Build-Depends on po-debconf |
1536 | + |
1537 | + -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Mar 2012 15:28:14 -0400 |
1538 | + |
1539 | +maas (0.1+bzr266+dfsg-0ubuntu1) precise; urgency=low |
1540 | + |
1541 | + * Remove support for squid3 and use squid-deb-proxy instead. |
1542 | + * debian/extras/maas: Add to handle syncdb and creation of admin user. |
1543 | + * Add debconf questions to ask for user/pass: |
1544 | + - debian/maas.{template,config}: Add |
1545 | + - debian/maas.postinst: Ask debconf questions. |
1546 | + - debian/po: Add translation templates.i |
1547 | + * debian/maas.postinst: Enable wsgi module; drop squid3 steps. |
1548 | + * debian/maas.postrm: removed. |
1549 | + * debian/patches/01-fix-database-settings.patch: Custom database settings |
1550 | + and static files path. |
1551 | + * debian/{rules,maas.install}: Install maas static files in |
1552 | + 'usr/share/maas/web/static'. |
1553 | + * Integrate cobbler: |
1554 | + - debian/maas.install: Install pserv twisted plugin, and config. |
1555 | + - debian/maas.upstart: Created to start plugin daemon. |
1556 | + - debian/patches/02-pserv-config.patch: Custom pserv config. |
1557 | + * Integrate dbconfig-common: |
1558 | + - debian/maas.config: Added and default user/pass and database. |
1559 | + - debian/maas.{postinst,postrm}: Added handling for dbconfig-common |
1560 | + * debian/control: Depends on python-convoy. |
1561 | + * debian/rules: Update path to removal of dsfg files. |
1562 | + * debian/patches/01-fix-database-settings.patch: Updated. |
1563 | + |
1564 | + -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 13 Mar 2012 14:31:50 -0400 |
1565 | + |
1566 | +maas (0.1+bzr232+dfsg-0ubuntu1) precise; urgency=low |
1567 | + |
1568 | + * New upstream snapshot. |
1569 | + |
1570 | + [ Dave Walker ] |
1571 | + * debian/control: |
1572 | + - Changed depends from psycopg2 to python-psycopg2 and dropped versioning. |
1573 | + - LP: #937982 |
1574 | + |
1575 | + [ Andres Rodriguez ] |
1576 | + * debian/maas.install: Install maas-import-isos and related files. |
1577 | + * Integrate squid3 as proxy solution: |
1578 | + - debian/extras/squid.conf: Added |
1579 | + - debian/control: Depend on squid3. |
1580 | + - debian/maas.{postinst,postrm}: Handle installation/removal of custom |
1581 | + squid config file. |
1582 | + * Split into different binary packages (maas,python-django-maas). |
1583 | + - debian/maas.postinst: Handle the apache2 configuration. |
1584 | + |
1585 | + -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 07 Mar 2012 12:46:17 -0500 |
1586 | + |
1587 | +maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low |
1588 | + |
1589 | + * New upstream snapshot, post 0.1 release. |
1590 | + * debian/control: |
1591 | + - Drop depends on rabbitmq-server, no longer required. |
1592 | + * debian/watch: Introduced watch file. |
1593 | + |
1594 | + -- Dave Walker (Daviey) <DaveWalker@ubuntu.com> Thu, 23 Feb 2012 13:08:12 +0000 |
1595 | + |
1596 | +maas (0.1~bzr146+dfsg-0ubuntu1) precise; urgency=low |
1597 | + |
1598 | + * Initial release |
1599 | + |
1600 | + -- Julian Edwards <julian.edwards@canonical.com> Thu, 16 Jan 2012 15:29:07 +0000 |
1601 | |
1602 | === added file 'debian/compat' |
1603 | --- debian/compat 1970-01-01 00:00:00 +0000 |
1604 | +++ debian/compat 2015-06-03 20:06:06 +0000 |
1605 | @@ -0,0 +1,1 @@ |
1606 | +7 |
1607 | |
1608 | === added file 'debian/control' |
1609 | --- debian/control 1970-01-01 00:00:00 +0000 |
1610 | +++ debian/control 2015-06-03 20:06:06 +0000 |
1611 | @@ -0,0 +1,233 @@ |
1612 | +Source: maas |
1613 | +Section: net |
1614 | +Priority: optional |
1615 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
1616 | +Build-Depends: debhelper (>= 8.1.0~), |
1617 | + dh-apport, |
1618 | + dh-systemd, |
1619 | + po-debconf, |
1620 | + python (>= 2.7), |
1621 | + python-distribute, |
1622 | + python-django |
1623 | +Standards-Version: 3.9.6 |
1624 | +X-Python-Version: >= 2.7 |
1625 | +Homepage: https://launchpad.net/maas |
1626 | + |
1627 | +Package: maas |
1628 | +Architecture: all |
1629 | +Depends: ${misc:Depends}, |
1630 | + maas-cluster-controller (= ${binary:Version}), |
1631 | + maas-region-controller (= ${binary:Version}), |
1632 | + python-django-maas (= ${binary:Version}) |
1633 | +Description: MAAS server all-in-one metapackage |
1634 | + MAAS is "Metal As A Service", a system for dynamic provisioning of physical |
1635 | + servers that has many of the same characteristics as a cloud. You register |
1636 | + servers with MAAS by telling MAAS about their IPMI or other control system. |
1637 | + MAAS can then do hardware inventory, and provision that system on demand |
1638 | + with whatever OS and software you like. MAAS is standalone software that |
1639 | + works with any configuration system, but for best results combine MAAS with |
1640 | + Juju. |
1641 | + . |
1642 | + MAAS provides: |
1643 | + * Hardware inventory of servers |
1644 | + * Dynamic provisioning based on name or attributes such as disk, RAM cores, sockets |
1645 | + * DNS and DHCP as needed |
1646 | + * PXE boot services |
1647 | + . |
1648 | + This package is a metapackage which installs all of the separate components |
1649 | + of MAAS on a single machine. |
1650 | + |
1651 | +Package: maas-common |
1652 | +Architecture: all |
1653 | +Depends: ${misc:Depends}, ${python:Depends} |
1654 | +Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) |
1655 | +Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) |
1656 | +Description: MAAS server common files |
1657 | + This package contains the common files for any MAAS installation. |
1658 | + |
1659 | +Package: maas-region-controller-min |
1660 | +Architecture: all |
1661 | +Depends: apache2, |
1662 | + bind9utils, |
1663 | + dbconfig-common, |
1664 | + iproute, |
1665 | + libjs-angularjs, |
1666 | + libjs-yui3-full, |
1667 | + libjs-yui3-min, |
1668 | + maas-common (= ${binary:Version}), |
1669 | + maas-proxy (= ${binary:Version}), |
1670 | + python-bson, |
1671 | + python-django16 | python-django (<< 1.7), |
1672 | + python-django, |
1673 | + python-django-maas (= ${binary:Version}), |
1674 | + python-django-piston, |
1675 | + python-django-south, |
1676 | + python-maas-provisioningserver (= ${binary:Version}), |
1677 | + python-djorm-ext-pgarray, |
1678 | + rsyslog, |
1679 | + ubuntu-cloudimage-keyring, |
1680 | + ${misc:Depends}, |
1681 | + ${python:Depends} |
1682 | +Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 ) |
1683 | +Replaces: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 ) |
1684 | +Description: MAAS Server minimum region controller |
1685 | + This package installs and configures the minimum region controller |
1686 | + services provided by MAAS, including the web UI, caching package proxy, |
1687 | + networking/traffic control, and remote logging system. |
1688 | + |
1689 | +Package: maas-region-controller |
1690 | +Architecture: all |
1691 | +Depends: maas-region-controller-min (= ${binary:Version}), |
1692 | + postgresql (>= 9.1), |
1693 | + ${misc:Depends}, |
1694 | + ${python:Depends} |
1695 | +Recommends: openssh-server, maas-dns (= ${binary:Version}) |
1696 | +Description: MAAS server complete region controller |
1697 | + This package installs and configures the complete MAAS region controller, |
1698 | + including the minimum setup, plus the database server and messaging queue. |
1699 | + |
1700 | +Package: python-maas-provisioningserver |
1701 | +Section: python |
1702 | +Architecture: all |
1703 | +Depends: python-bson, |
1704 | + python-crochet, |
1705 | + python-distro-info, |
1706 | + python-formencode, |
1707 | + python-jsonschema, |
1708 | + python-lockfile, |
1709 | + python-lxml, |
1710 | + python-maas-client (= ${binary:Version}), |
1711 | + python-netifaces, |
1712 | + python-paramiko, |
1713 | + python-pexpect, |
1714 | + python-pyparsing, |
1715 | + python-seamicroclient, |
1716 | + python-simplestreams, |
1717 | + python-tempita, |
1718 | + python-twisted-core, |
1719 | + python-twisted-web, |
1720 | + python-txamqp, |
1721 | + python-txtftp, |
1722 | + python-yaml, |
1723 | + python-zope.interface, |
1724 | + ${misc:Depends}, |
1725 | + ${python:Depends} |
1726 | +Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1) |
1727 | +Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1) |
1728 | +Description: MAAS server provisioning libraries |
1729 | + This package provides the MAAS provisioning server python libraries. |
1730 | + |
1731 | +Package: maas-cli |
1732 | +Architecture: all |
1733 | +Depends: python-bzrlib, |
1734 | + python-httplib2, |
1735 | + python-maas-client (= ${binary:Version}), |
1736 | + python-oauth, |
1737 | + ${misc:Depends}, |
1738 | + ${python:Depends} |
1739 | +Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1) |
1740 | +Replaces: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1) |
1741 | +Description: MAAS command line API tool |
1742 | + This package contains the MAAS client command line API tool. |
1743 | + This tool enables automation of tasks in MAAS, remotely, through |
1744 | + its API. |
1745 | + |
1746 | +Package: python-maas-client |
1747 | +Section: python |
1748 | +Architecture: all |
1749 | +Depends: python-oauth, ${misc:Depends}, ${python:Depends} |
1750 | +Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ) |
1751 | +Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ) |
1752 | +Description: MAAS python API client |
1753 | + This package contains the MAAS client API Python modules. |
1754 | + |
1755 | +Package: maas-cluster-controller |
1756 | +Architecture: all |
1757 | +Depends: authbind, |
1758 | + bind9utils, |
1759 | + distro-info, |
1760 | + freeipmi-tools, |
1761 | + grub-common, |
1762 | + maas-cli (=${binary:Version}), |
1763 | + maas-common (=${binary:Version}), |
1764 | + maas-dhcp (=${binary:Version}), |
1765 | + python-httplib2, |
1766 | + python-lockfile, |
1767 | + python-maas-provisioningserver (=${binary:Version}), |
1768 | + python-netaddr, |
1769 | + python-oauth, |
1770 | + python-tempita, |
1771 | + python-twisted, |
1772 | + python-zope.interface, |
1773 | + rsyslog, |
1774 | + pxelinux | syslinux-common (<< 3:6.00~pre4+dfsg-5), |
1775 | + syslinux-common, |
1776 | + tgt, |
1777 | + uuid-runtime, |
1778 | + wget, |
1779 | + ${misc:Depends}, |
1780 | + ${python:Depends} |
1781 | +Suggests: ipmitool, libvirt-bin, amtterm, python-pyvmomi |
1782 | +Conflicts: tftpd-hpa |
1783 | +Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ) |
1784 | +Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ) |
1785 | +Description: MAAS server cluster controller |
1786 | + This package contains the MAAS cluster controller, which is responsible |
1787 | + for enabling and controlling remote DHCP/TFTP instances on their own |
1788 | + subnets. |
1789 | + |
1790 | +Package: python-django-maas |
1791 | +Section: python |
1792 | +Architecture: all |
1793 | +Depends: python-amqp, |
1794 | + python-apt, |
1795 | + python-convoy, |
1796 | + python-crochet, |
1797 | + python-curtin, |
1798 | + python-lockfile, |
1799 | + python-lxml, |
1800 | + python-maas-client (= ${binary:Version}), |
1801 | + python-netaddr, |
1802 | + python-psycopg2, |
1803 | + python-sphinx, |
1804 | + python-tempita, |
1805 | + python-twisted, |
1806 | + python-txamqp, |
1807 | + python-zope.interface, |
1808 | + ${misc:Depends}, |
1809 | + ${python:Depends} |
1810 | +Description: MAAS server Django web framework |
1811 | + This package provides the Django web framework for MAAS. |
1812 | + |
1813 | +Package: maas-dhcp |
1814 | +Architecture: all |
1815 | +Depends: isc-dhcp-server (>= 4.2.4), ${misc:Depends} |
1816 | +Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) |
1817 | +Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) |
1818 | +Description: MAAS DHCP server |
1819 | + This package installs and configures a DHCP server that can be used by |
1820 | + MAAS, and enhances the overall MAAS user experience. |
1821 | + |
1822 | +Package: maas-dns |
1823 | +Architecture: all |
1824 | +Depends: bind9, |
1825 | + maas-region-controller-min (= ${binary:Version}), |
1826 | + python-iscpy, |
1827 | + ${misc:Depends} |
1828 | +Conflicts: dnsmasq |
1829 | +Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) |
1830 | +Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) |
1831 | +Description: MAAS DNS server |
1832 | + This package installs and configures a DNS server that can be used by |
1833 | + MAAS, and enhances the overall MAAS user experience. |
1834 | + |
1835 | +Package: maas-proxy |
1836 | +Architecture: all |
1837 | +Depends: ${python:Depends}, |
1838 | + ${misc:Depends}, |
1839 | + squid3 |
1840 | +Conflicts: squid-deb-proxy |
1841 | +Replaces: squid-deb-proxy |
1842 | +Description: MAAS Caching Proxy |
1843 | + This package installs and configures a Caching Proxy server that can be |
1844 | + used by MAAS. It enhances the overall MAAS user experience. |
1845 | |
1846 | === added file 'debian/copyright' |
1847 | --- debian/copyright 1970-01-01 00:00:00 +0000 |
1848 | +++ debian/copyright 2015-06-03 20:06:06 +0000 |
1849 | @@ -0,0 +1,45 @@ |
1850 | +Format: http://dep.debian.net/deps/dep5 |
1851 | +Upstream-Name: maas |
1852 | +Source: https://launchpad.net/maas |
1853 | + |
1854 | +Files: * |
1855 | +Copyright: 2012 Canonical Ltd. |
1856 | +License: AGPL-3.0+ |
1857 | + |
1858 | +Files: debian/* |
1859 | +Copyright: 2012 Canonical Ltd. |
1860 | +License: AGPL-3.0+ |
1861 | + |
1862 | +License: AGPL-3.0+ |
1863 | + This program is free software: you can redistribute it and/or modify |
1864 | + it under the terms of the GNU Affero General Public License as |
1865 | + published by the Free Software Foundation, either version 3 of the |
1866 | + License, or (at your option) any later version. |
1867 | + . |
1868 | + This program is distributed in the hope that it will be useful, |
1869 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
1870 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1871 | + GNU Affero General Public License for more details. |
1872 | + . |
1873 | + You should have received a copy of the GNU Affero General Public License |
1874 | + along with this program. If not, see <http://www.gnu.org/licenses/>. |
1875 | + |
1876 | +Files: src/maasserver/static/js/angular/3rdparty/ng-tags-input.js |
1877 | +Copyright: Copyright (c) 2013-2015 Michael Benford. |
1878 | +License: MIT |
1879 | + Permission is hereby granted, free of charge, to any person obtaining a copy of |
1880 | + this software and associated documentation files (the "Software"), to deal in |
1881 | + the Software without restriction, including without limitation the rights to |
1882 | + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of |
1883 | + the Software, and to permit persons to whom the Software is furnished to do so, |
1884 | + subject to the following conditions: |
1885 | + . |
1886 | + The above copyright notice and this permission notice shall be included in all |
1887 | + copies or substantial portions of the Software. |
1888 | + . |
1889 | + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
1890 | + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS |
1891 | + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR |
1892 | + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER |
1893 | + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
1894 | + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
1895 | |
1896 | === added directory 'debian/extras' |
1897 | === added file 'debian/extras/20-maas.conf' |
1898 | --- debian/extras/20-maas.conf 1970-01-01 00:00:00 +0000 |
1899 | +++ debian/extras/20-maas.conf 2015-06-03 20:06:06 +0000 |
1900 | @@ -0,0 +1,32 @@ |
1901 | +# Enable the udp server for installation logging |
1902 | +$ModLoad imudp |
1903 | +$UDPServerRun 514 |
1904 | +$ModLoad imtcp # load TCP listener |
1905 | + |
1906 | +# The following section (certificates) was copied from orchestra, but is |
1907 | +# not used here. In the future, if we needed secure ssl, then re-enable. |
1908 | +# These files were created in the orchestra-logging-server's postinst |
1909 | +# |
1910 | +## make gtls driver the default |
1911 | +#$DefaultNetstreamDriver gtls |
1912 | +# |
1913 | +## certificate files |
1914 | +#$DefaultNetstreamDriverCAFile /var/lib/maas/ssl-cert-orchestra-ca.pem |
1915 | +#$DefaultNetstreamDriverCertFile /var/lib/maas/.ssl/ssl-cert-orchestra.pem |
1916 | +#$DefaultNetstreamDriverKeyFile /var/lib/maas/.ssl/ssl-cert-orchestra-pk.pem |
1917 | +# |
1918 | +#$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode |
1919 | +#$InputTCPServerStreamDriverAuthMode anon # client is NOT authenticated |
1920 | +#$InputTCPServerRun 10514 # start up listener at port 10514 |
1921 | + |
1922 | +# Reduce message repetition |
1923 | +$RepeatedMsgReduction on |
1924 | +##$RepeatedMsgContainsOrigionalMsg on |
1925 | + |
1926 | +# Message templating |
1927 | +$template MAASboot,"/var/log/maas/rsyslog/%HOSTNAME%/%$YEAR%/%$MONTH%/%$DAY%/messages" |
1928 | + |
1929 | +:fromhost-ip, !isequal, "127.0.0.1" ?MAASboot |
1930 | +# Stop messages that came from anywhere else from going into other places |
1931 | +# like /var/log/syslog. If you want to see these messages there, then comment below |
1932 | +& ~ |
1933 | |
1934 | === added file 'debian/extras/99-maas' |
1935 | --- debian/extras/99-maas 1970-01-01 00:00:00 +0000 |
1936 | +++ debian/extras/99-maas 2015-06-03 20:06:06 +0000 |
1937 | @@ -0,0 +1,5 @@ |
1938 | +# /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas |
1939 | +# |
1940 | +# Enable launchpad personal package archives for squid-deb-proxy |
1941 | +ppa.launchpad.net |
1942 | +keyserver.ubuntu.com |
1943 | |
1944 | === added file 'debian/extras/99-maas-sudoers' |
1945 | --- debian/extras/99-maas-sudoers 1970-01-01 00:00:00 +0000 |
1946 | +++ debian/extras/99-maas-sudoers 2015-06-03 20:06:06 +0000 |
1947 | @@ -0,0 +1,12 @@ |
1948 | +maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd start |
1949 | +maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd status |
1950 | +maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd restart |
1951 | +maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd stop |
1952 | +maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd6 start |
1953 | +maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd6 status |
1954 | +maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd6 restart |
1955 | +maas ALL= NOPASSWD: /usr/sbin/service maas-dhcpd6 stop |
1956 | +maas ALL= NOPASSWD: /usr/sbin/service tgt status |
1957 | +maas ALL= NOPASSWD: /usr/sbin/service tgt start |
1958 | +maas ALL= NOPASSWD: /usr/sbin/maas-provision |
1959 | +maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar |
1960 | |
1961 | === added file 'debian/extras/isc-dhcp-server.override' |
1962 | --- debian/extras/isc-dhcp-server.override 1970-01-01 00:00:00 +0000 |
1963 | +++ debian/extras/isc-dhcp-server.override 2015-06-03 20:06:06 +0000 |
1964 | @@ -0,0 +1,1 @@ |
1965 | +manual |
1966 | |
1967 | === added file 'debian/extras/maas' |
1968 | --- debian/extras/maas 1970-01-01 00:00:00 +0000 |
1969 | +++ debian/extras/maas 2015-06-03 20:06:06 +0000 |
1970 | @@ -0,0 +1,6 @@ |
1971 | +#!/bin/sh |
1972 | +if [ "`expr \"$0\" : \".*maas-cli*\"`" != "0" ];then |
1973 | + echo " WARNING: The maas-cli command is deprecated and will be removed" \ |
1974 | + "in a future\n version. From now on please use 'maas' instead." >&2 |
1975 | +fi |
1976 | +exec python -m maascli "$@" |
1977 | |
1978 | === added file 'debian/extras/maas-probe-dhcp' |
1979 | --- debian/extras/maas-probe-dhcp 1970-01-01 00:00:00 +0000 |
1980 | +++ debian/extras/maas-probe-dhcp 2015-06-03 20:06:06 +0000 |
1981 | @@ -0,0 +1,7 @@ |
1982 | +#!/bin/sh |
1983 | +if [ "$(id -u)" != "0" ]; then |
1984 | + echo "This utility may only be run as root." 1>&2 |
1985 | + exit 1 |
1986 | +fi |
1987 | +export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}" |
1988 | +exec /usr/bin/python -m provisioningserver.dhcp.probe "$@" |
1989 | |
1990 | === added file 'debian/extras/maas-provision' |
1991 | --- debian/extras/maas-provision 1970-01-01 00:00:00 +0000 |
1992 | +++ debian/extras/maas-provision 2015-06-03 20:06:06 +0000 |
1993 | @@ -0,0 +1,7 @@ |
1994 | +#!/bin/sh |
1995 | +if [ "$(id -u)" != "0" ]; then |
1996 | + echo "This utility may only be run as root." 1>&2 |
1997 | + exit 1 |
1998 | +fi |
1999 | +export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}" |
2000 | +exec /usr/bin/python -m provisioningserver "$@" |
2001 | |
2002 | === added file 'debian/extras/maas-proxy-common.sh' |
2003 | --- debian/extras/maas-proxy-common.sh 1970-01-01 00:00:00 +0000 |
2004 | +++ debian/extras/maas-proxy-common.sh 2015-06-03 20:06:06 +0000 |
2005 | @@ -0,0 +1,34 @@ |
2006 | +pre_start() { |
2007 | + if [ -x /usr/sbin/squid ]; then |
2008 | + SQUID=/usr/sbin/squid |
2009 | + elif [ -x /usr/sbin/squid3 ]; then |
2010 | + SQUID=/usr/sbin/squid3 |
2011 | + else |
2012 | + echo "No squid binary found" |
2013 | + exit 1 |
2014 | + fi |
2015 | + |
2016 | + # ensure all cache dirs are there |
2017 | + install -d -o proxy -g proxy -m 750 /var/cache/maas-proxy/ |
2018 | + install -d -o proxy -g proxy -m 750 /var/log/maas/proxy/ |
2019 | + install -m 750 -o proxy -g proxy -d /var/spool/maas-proxy/ |
2020 | + if [ -d /var/log/maas/proxy ]; then |
2021 | + chown -R proxy:proxy /var/log/maas/proxy |
2022 | + fi |
2023 | + if [ ! -d /var/cache/maas-proxy/00 ]; then |
2024 | + $SQUID -z -N -f /etc/maas/maas-proxy.conf |
2025 | + fi |
2026 | +} |
2027 | + |
2028 | +# from the squid3 debian init script |
2029 | +find_cache_dir () { |
2030 | + w=" " # space tab |
2031 | + res=`sed -ne ' |
2032 | + s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p; |
2033 | + t end; |
2034 | + d; |
2035 | + :end q' < $CONFIG` |
2036 | + [ -n "$res" ] || res=$2 |
2037 | + echo "$res" |
2038 | +} |
2039 | + |
2040 | |
2041 | === added file 'debian/extras/maas-proxy.conf' |
2042 | --- debian/extras/maas-proxy.conf 1970-01-01 00:00:00 +0000 |
2043 | +++ debian/extras/maas-proxy.conf 2015-06-03 20:06:06 +0000 |
2044 | @@ -0,0 +1,37 @@ |
2045 | +# Inspired by UDS's conference proxy |
2046 | + |
2047 | +acl maas_proxy_manager proto cache_object |
2048 | +acl localhost src 127.0.0.1/32 ::1 |
2049 | +acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1 |
2050 | +acl localnet src all # TODO: We should auto-generate this with the networks MAAS manages/knows about. |
2051 | +acl SSL_ports port 443 |
2052 | +acl Safe_ports port 80 # http |
2053 | +acl Safe_ports port 21 # ftp |
2054 | +acl Safe_ports port 443 # https |
2055 | +acl Safe_ports port 1025-65535 # unregistered ports |
2056 | +acl CONNECT method CONNECT |
2057 | +http_access allow maas_proxy_manager localhost |
2058 | +http_access deny maas_proxy_manager |
2059 | +http_access deny !Safe_ports |
2060 | +http_access deny CONNECT !SSL_ports |
2061 | +http_access allow localnet |
2062 | +http_access allow localhost |
2063 | +http_access deny all |
2064 | +http_port 3128 transparent |
2065 | +http_port 8000 |
2066 | +coredump_dir /var/spool/maas-proxy |
2067 | +refresh_pattern ^ftp: 1440 20% 10080 |
2068 | +refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 |
2069 | +refresh_pattern (Release|Packages(.gz)*)$ 0 20% 2880 |
2070 | +refresh_pattern . 0 20% 4320 |
2071 | +forwarded_for delete |
2072 | +visible_hostname maas.proxy # TODO: This should be autogenerated by a template. |
2073 | +cache_mem 512 MB |
2074 | +minimum_object_size 0 MB |
2075 | +maximum_object_size 1024 MB |
2076 | +maximum_object_size_in_memory 100 MB |
2077 | +cache_dir aufs /var/spool/maas-proxy 40000 16 256 |
2078 | +# use different logs |
2079 | +cache_access_log /var/log/maas/proxy/access.log |
2080 | +cache_log /var/log/maas/proxy/cache.log |
2081 | +cache_store_log /var/log/maas/proxy/store.log |
2082 | |
2083 | === added file 'debian/extras/maas-region-admin' |
2084 | --- debian/extras/maas-region-admin 1970-01-01 00:00:00 +0000 |
2085 | +++ debian/extras/maas-region-admin 2015-06-03 20:06:06 +0000 |
2086 | @@ -0,0 +1,22 @@ |
2087 | +#!/usr/bin/python |
2088 | +import os |
2089 | +import sys |
2090 | + |
2091 | +user_id = os.getuid() |
2092 | +if user_id != 0: |
2093 | + print("This utility may only be run as root.") |
2094 | + sys.exit(1) |
2095 | + |
2096 | +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings") |
2097 | +sys.path.append('/usr/share/maas') |
2098 | + |
2099 | +# Use Django 1.6 if the python-django16 package is installed: this is |
2100 | +# to get MAAS to work on vivid: vivid ships with Django 1.7 by default |
2101 | +# and MAAS isn't yet compatible with Django 1.7. |
2102 | +if os.path.exists('/usr/lib/django16'): |
2103 | + sys.path.insert(1, '/usr/lib/django16') |
2104 | + |
2105 | +from django.core import management |
2106 | + |
2107 | +if __name__ == "__main__": |
2108 | + management.execute_from_command_line() |
2109 | |
2110 | === added file 'debian/extras/maas_remote_syslog_compress' |
2111 | --- debian/extras/maas_remote_syslog_compress 1970-01-01 00:00:00 +0000 |
2112 | +++ debian/extras/maas_remote_syslog_compress 2015-06-03 20:06:06 +0000 |
2113 | @@ -0,0 +1,2 @@ |
2114 | +# Compress log files not changed in more than 48 hours: |
2115 | +30 4 * * * root find /var/log/maas/rsyslog -type f -mtime +2 -exec bzip2 '{}' \; |
2116 | |
2117 | === added file 'debian/extras/squid3.override' |
2118 | --- debian/extras/squid3.override 1970-01-01 00:00:00 +0000 |
2119 | +++ debian/extras/squid3.override 2015-06-03 20:06:06 +0000 |
2120 | @@ -0,0 +1,1 @@ |
2121 | +manual |
2122 | |
2123 | === added file 'debian/maas-cli.install' |
2124 | --- debian/maas-cli.install 1970-01-01 00:00:00 +0000 |
2125 | +++ debian/maas-cli.install 2015-06-03 20:06:06 +0000 |
2126 | @@ -0,0 +1,2 @@ |
2127 | +debian/extras/maas usr/bin |
2128 | +debian/tmp/usr/lib/python*/dist-packages/maascli |
2129 | |
2130 | === added file 'debian/maas-cli.links' |
2131 | --- debian/maas-cli.links 1970-01-01 00:00:00 +0000 |
2132 | +++ debian/maas-cli.links 2015-06-03 20:06:06 +0000 |
2133 | @@ -0,0 +1,1 @@ |
2134 | +usr/bin/maas usr/bin/maas-cli |
2135 | |
2136 | === added file 'debian/maas-cli.lintian-overrides' |
2137 | --- debian/maas-cli.lintian-overrides 1970-01-01 00:00:00 +0000 |
2138 | +++ debian/maas-cli.lintian-overrides 2015-06-03 20:06:06 +0000 |
2139 | @@ -0,0 +1,1 @@ |
2140 | +maas-cli: binary-without-manpage usr/bin/maas-cli |
2141 | |
2142 | === added file 'debian/maas-cluster-controller.config' |
2143 | --- debian/maas-cluster-controller.config 1970-01-01 00:00:00 +0000 |
2144 | +++ debian/maas-cluster-controller.config 2015-06-03 20:06:06 +0000 |
2145 | @@ -0,0 +1,36 @@ |
2146 | +#!/bin/sh |
2147 | + |
2148 | +set -e |
2149 | + |
2150 | +. /usr/share/debconf/confmodule |
2151 | +db_version 2.0 |
2152 | + |
2153 | +# Only ask for new installations and reconfiguring. |
2154 | +# XXX Fix to not ask when installing from the CD. |
2155 | +if ([ "$1" = "configure" ] && [ -z "$2" ]); then |
2156 | + |
2157 | + db_get maas-cluster-controller/maas-url || true |
2158 | + if [ -z "$RET" ]; then |
2159 | + # Attempt to pre-populate if installing on the region controller. |
2160 | + if [ -e /etc/maas/maas_local_settings.py ]; then |
2161 | + url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py) |
2162 | + # If the URL doesn't end in /MAAS then add it. This helps upgrades from |
2163 | + # precise for which the URL didn't contain /MAAS, which is now required |
2164 | + if ! echo $url | grep -qs "/MAAS$"; then |
2165 | + url="${url}/MAAS" |
2166 | + fi |
2167 | + db_set maas-cluster-controller/maas-url "$url" |
2168 | + else |
2169 | + # Will only get here if dbconf value not already set, or |
2170 | + # /etc/maas/maas_local_settings.py doesn't exist. |
2171 | + db_input medium maas-cluster-controller/maas-url || true |
2172 | + db_go |
2173 | + fi |
2174 | + fi |
2175 | +fi |
2176 | + |
2177 | +if [ "$1" = "reconfigure" ]; then |
2178 | + db_input high maas-cluster-controller/maas-url || true |
2179 | + db_go |
2180 | +fi |
2181 | +#DEBHELPER# |
2182 | |
2183 | === added file 'debian/maas-cluster-controller.dirs' |
2184 | --- debian/maas-cluster-controller.dirs 1970-01-01 00:00:00 +0000 |
2185 | +++ debian/maas-cluster-controller.dirs 2015-06-03 20:06:06 +0000 |
2186 | @@ -0,0 +1,2 @@ |
2187 | +etc/maas |
2188 | +var/lib/maas/boot-resources |
2189 | |
2190 | === added file 'debian/maas-cluster-controller.install' |
2191 | --- debian/maas-cluster-controller.install 1970-01-01 00:00:00 +0000 |
2192 | +++ debian/maas-cluster-controller.install 2015-06-03 20:06:06 +0000 |
2193 | @@ -0,0 +1,21 @@ |
2194 | +# Install twisted plugins |
2195 | +twisted/plugins/maasclusterd.py usr/share/pyshared/twisted/plugins |
2196 | + |
2197 | +# Install PSERV config file |
2198 | +debian/tmp/etc/maas/pserv.yaml |
2199 | + |
2200 | +# Install cluster config file |
2201 | +debian/tmp/etc/maas/maas_cluster.conf |
2202 | + |
2203 | +# Install templates |
2204 | +debian/tmp/etc/maas/templates/dhcp |
2205 | +debian/tmp/etc/maas/templates/power |
2206 | +debian/tmp/etc/maas/templates/pxe |
2207 | +debian/tmp/etc/maas/templates/uefi |
2208 | + |
2209 | +# Install uec2roottar |
2210 | +debian/tmp/usr/bin/uec2roottar |
2211 | + |
2212 | +# Install all other stuff |
2213 | +debian/extras/99-maas-sudoers etc/sudoers.d |
2214 | +debian/extras/isc-dhcp-server.override etc/init |
2215 | |
2216 | === added file 'debian/maas-cluster-controller.lintian-overrides' |
2217 | --- debian/maas-cluster-controller.lintian-overrides 1970-01-01 00:00:00 +0000 |
2218 | +++ debian/maas-cluster-controller.lintian-overrides 2015-06-03 20:06:06 +0000 |
2219 | @@ -0,0 +1,1 @@ |
2220 | +maas-cluster-controller: binary-without-manpage usr/bin/uec2roottar |
2221 | |
2222 | === added file 'debian/maas-cluster-controller.logrotate' |
2223 | --- debian/maas-cluster-controller.logrotate 1970-01-01 00:00:00 +0000 |
2224 | +++ debian/maas-cluster-controller.logrotate 2015-06-03 20:06:06 +0000 |
2225 | @@ -0,0 +1,15 @@ |
2226 | +/var/log/maas/clusterd.log { |
2227 | + rotate 5 |
2228 | + weekly |
2229 | + compress |
2230 | + missingok |
2231 | + # copytruncate may lose log messages at the moment of rotation, but |
2232 | + # there is no better way to integrate twistd and logrotate. |
2233 | + copytruncate |
2234 | + # The logs are all owned by the `maas` user, so drop privs. |
2235 | + su maas maas |
2236 | + # Don't rotate unless the log is at least 10MB. |
2237 | + minsize 10M |
2238 | + # Force rotation if the log grows beyond 50MB. |
2239 | + maxsize 50M |
2240 | +} |
2241 | |
2242 | === added file 'debian/maas-cluster-controller.maas-clusterd.service' |
2243 | --- debian/maas-cluster-controller.maas-clusterd.service 1970-01-01 00:00:00 +0000 |
2244 | +++ debian/maas-cluster-controller.maas-clusterd.service 2015-06-03 20:06:06 +0000 |
2245 | @@ -0,0 +1,26 @@ |
2246 | +[Unit] |
2247 | +Description=MAAS Cluster Controller |
2248 | +Documentation=https://maas.ubuntu.com/ |
2249 | +Requires=network-online.target |
2250 | +After=network-online.target |
2251 | +ConditionPathExists=/var/lib/maas/secret |
2252 | +# These will go away one we support new config files. |
2253 | +ConditionPathExists=/etc/maas/maas_cluster.conf |
2254 | +ConditionPathExists=/etc/maas/pserv.yaml |
2255 | + |
2256 | +[Service] |
2257 | +User=maas |
2258 | +Group=maas |
2259 | +Restart=always |
2260 | +EnvironmentFile=/etc/maas/maas_cluster.conf |
2261 | +Environment="LOGFILE=/var/log/maas/clusterd.log" |
2262 | +# Logs go to the journal; read them with |
2263 | +# journalctl -u maas-clusterd |
2264 | +# Logs also go to $LOGFILE for backward compatibility. The journal |
2265 | +# should now be preferred as the $LOGFILE will be removed in MAAS 1.9. |
2266 | +ExecStart=/bin/sh -c \ |
2267 | + 'exec /usr/bin/authbind --deep /usr/bin/twistd --nodaemon --pidfile= \ |
2268 | + maas-clusterd --config-file=/etc/maas/pserv.yaml 2>&1 | tee -a $LOGFILE' |
2269 | + |
2270 | +[Install] |
2271 | +WantedBy=multi-user.target |
2272 | |
2273 | === added file 'debian/maas-cluster-controller.maas-clusterd.upstart' |
2274 | --- debian/maas-cluster-controller.maas-clusterd.upstart 1970-01-01 00:00:00 +0000 |
2275 | +++ debian/maas-cluster-controller.maas-clusterd.upstart 2015-06-03 20:06:06 +0000 |
2276 | @@ -0,0 +1,52 @@ |
2277 | +description "MAAS Cluster Controller" |
2278 | +author "Andres Rodriguez <andres.rodriguez@canonical.com>" |
2279 | + |
2280 | +start on filesystem and net-device-up |
2281 | +stop on runlevel [016] |
2282 | + |
2283 | +respawn |
2284 | + |
2285 | +env CONFIG_FILE=/etc/maas/maas_cluster.conf |
2286 | +env LOGFILE=/var/log/maas/clusterd.log |
2287 | + |
2288 | +pre-start script |
2289 | + if [ ! -f $CONFIG_FILE ]; then |
2290 | + echo "$CONFIG_FILE does not exist. Aborting." |
2291 | + stop |
2292 | + exit 0 |
2293 | + fi |
2294 | +end script |
2295 | + |
2296 | +script |
2297 | + # Exit immediately on error, and treat unset variables as errors. In |
2298 | + # sh/dash, unfortunately, the following does not cause the use of an unset |
2299 | + # variable to halt the script, it merely prints an error and sets $?. |
2300 | + set -o errexit -o nounset |
2301 | + # Load the configuration file. |
2302 | + . $CONFIG_FILE |
2303 | + # The MAAS cluster controller needs both CLUSTER_UUID and MAAS_URL to |
2304 | + # operate. |
2305 | + export CLUSTER_UUID |
2306 | + export MAAS_URL |
2307 | + # Check for the shared-secret. If it's not here, sleep for a while, then |
2308 | + # exit and allow respawn to do its thing. |
2309 | + if ! maas-provision check-for-shared-secret >/dev/null; then |
2310 | + fmt -w 72 <<-'EOF' >&2 |
2311 | + A shared secret has not been installed for this cluster. Obtain |
2312 | + the secret from the region (find it in /var/lib/maas/secret once |
2313 | + the region controller has started for the first time) and |
2314 | + install it with `maas-provision install-shared-secret`. |
2315 | + |
2316 | + However, if this machine is also serving as the region, ensure |
2317 | + that the region controller is started (`sudo service apache2 |
2318 | + start` typically). It will create the shared secret, which |
2319 | + maas-clusterd will then find when it respawns in 5 seconds. |
2320 | + |
2321 | + EOF |
2322 | + exec sleep 5 |
2323 | + fi |
2324 | + # To add options to your daemon, edit the line below: |
2325 | + exec /usr/bin/authbind --deep \ |
2326 | + /usr/bin/twistd --nodaemon --uid=maas --gid=maas --pidfile= \ |
2327 | + maas-clusterd --config-file=/etc/maas/pserv.yaml > ${LOGFILE} 2>&1 |
2328 | +end script |
2329 | |
2330 | === added file 'debian/maas-cluster-controller.maintscript' |
2331 | --- debian/maas-cluster-controller.maintscript 1970-01-01 00:00:00 +0000 |
2332 | +++ debian/maas-cluster-controller.maintscript 2015-06-03 20:06:06 +0000 |
2333 | @@ -0,0 +1,7 @@ |
2334 | +rm_conffile /etc/maas/bootresources.yaml 1.7.0~beta1+bzr2781-0ubuntu1 |
2335 | +rm_conffile /etc/maas/maas_local_celeryconfig_cluster.py 1.7.0~beta3+bzr3043-0ubuntu1 |
2336 | +rm_conffile /etc/init/maas-cluster-celery.conf 1.7.0~beta3+bzr3043-0ubuntu1 |
2337 | +rm_conffile /etc/init/maas-pserv.conf 1.7.0~beta3+bzr3043-0ubuntu1 |
2338 | +rm_conffile /etc/init/maas-cluster.conf 1.7.0~beta6+bzr3231-0ubuntu1 |
2339 | +rm_conffile /etc/init/maas-cluster-register.conf 1.7.0~beta6+bzr3231-0ubuntu1 |
2340 | +rm_conffile /etc/maas/maas-cluster-http.conf 1.8.0~alpha1+bzr3522-0ubuntu1 |
2341 | |
2342 | === added file 'debian/maas-cluster-controller.postinst' |
2343 | --- debian/maas-cluster-controller.postinst 1970-01-01 00:00:00 +0000 |
2344 | +++ debian/maas-cluster-controller.postinst 2015-06-03 20:06:06 +0000 |
2345 | @@ -0,0 +1,140 @@ |
2346 | +#!/bin/sh |
2347 | + |
2348 | +set -e |
2349 | + |
2350 | +. /usr/share/debconf/confmodule |
2351 | +db_version 2.0 |
2352 | + |
2353 | +RELEASE=`lsb_release -rs` || RELEASE="" |
2354 | + |
2355 | +create_var_dir() { |
2356 | + # create var dir |
2357 | + if [ ! -d /var/lib/maas ]; then |
2358 | + mkdir -p /var/lib/maas |
2359 | + fi |
2360 | + chown -R maas:maas /var/lib/maas/ |
2361 | + |
2362 | +} |
2363 | +create_log_dir() { |
2364 | + # Give appropriate permissions |
2365 | + if [ ! -f /var/log/maas/clusterd.log ]; then |
2366 | + touch /var/log/maas/clusterd.log |
2367 | + fi |
2368 | + chown maas:maas /var/log/maas/clusterd.log |
2369 | +} |
2370 | + |
2371 | +configure_maas_tgt() { |
2372 | + # Ensure that iSCSI targets get re-defined on reboot. |
2373 | + # Creates a softlink in /etc/tgt/conf.d/ that points to the current |
2374 | + # boot images' tgt configuration. |
2375 | + mkdir -p /etc/tgt/conf.d |
2376 | + ln -sf /var/lib/maas/boot-resources/current/maas.tgt /etc/tgt/conf.d/maas.conf |
2377 | +} |
2378 | + |
2379 | +extract_cluster_uuid(){ |
2380 | + # Extract ClUSTER_UUID setting from config file $1. This will work |
2381 | + # the cluster config (which is shell). |
2382 | + sed -n -e "s/^CLUSTER_UUID *= *[\"']\([^\"']*\).*/\1/p" "$1" |
2383 | +} |
2384 | + |
2385 | +configure_cluster_uuid(){ |
2386 | + # The cluster uuid goes into maas_cluster.conf. If an old uuid is |
2387 | + # configured, we replicate that to maas_cluster.conf; otherwise, |
2388 | + # we want to generate one. |
2389 | + local uuid |
2390 | + |
2391 | + if [ -n "$(extract_cluster_uuid /etc/maas/maas_cluster.conf)" ]; then |
2392 | + # UUID is already set up. Wonderful. |
2393 | + return |
2394 | + else |
2395 | + # No UUID at all yet. Generate one. |
2396 | + uuid="$(uuidgen)" |
2397 | + fi |
2398 | + |
2399 | + # Write the uuid to maas_cluster.conf |
2400 | + # There is no initial placeholder in this file, so just append the setting. |
2401 | + echo "CLUSTER_UUID=\"$uuid\"" >>/etc/maas/maas_cluster.conf |
2402 | +} |
2403 | + |
2404 | +enable_apache_version_mod(){ |
2405 | + COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true) |
2406 | + if [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then |
2407 | + a2enmod version |
2408 | + fi |
2409 | +} |
2410 | + |
2411 | +configure_cluster_authbind() { |
2412 | + MAAS_UID="`id -u maas`" |
2413 | + if [ ! -f "/etc/authbind/byuid/$MAAS_UID" ]; then |
2414 | + if [ ! -d "/etc/authbind/byuid" ]; then |
2415 | + mkdir -p /etc/authbind/byuid |
2416 | + chmod 755 /etc/authbind |
2417 | + chmod 755 /etc/authbind/byuid |
2418 | + fi |
2419 | + fi |
2420 | + echo '0.0.0.0/0:68,69' >/etc/authbind/byuid/$MAAS_UID |
2421 | + echo '::/0,68-69' >>/etc/authbind/byuid/$MAAS_UID |
2422 | + chown maas:maas /etc/authbind/byuid/$MAAS_UID |
2423 | + chmod 700 /etc/authbind/byuid/$MAAS_UID |
2424 | +} |
2425 | + |
2426 | +restart_apache2(){ |
2427 | + if [ -x /usr/sbin/invoke-rc.d ]; then |
2428 | + invoke-rc.d apache2 restart || true |
2429 | + else |
2430 | + /etc/init.d/apache2 restart || true |
2431 | + fi |
2432 | +} |
2433 | + |
2434 | +configure_maas_url(){ |
2435 | + # Get the MAAS_URL on configure/reconfigure and write it to the conf files. |
2436 | + db_get maas-cluster-controller/maas-url || true |
2437 | + if [ -n "$RET" ]; then |
2438 | + maas-provision configure-maas-url "$RET" |
2439 | + fi |
2440 | +} |
2441 | + |
2442 | +configure_shared_secret() { |
2443 | + db_get maas-cluster-controller/shared-secret || true |
2444 | + if [ -n "$RET" ]; then |
2445 | + echo "$RET" | maas-provision install-shared-secret |
2446 | + chown maas:maas /var/lib/maas/secret |
2447 | + chmod 0640 /var/lib/maas/secret |
2448 | + fi |
2449 | +} |
2450 | + |
2451 | + |
2452 | +if [ "$1" = "configure" ] && [ -z "$2" ]; then |
2453 | + create_log_dir |
2454 | + create_var_dir |
2455 | + configure_maas_tgt |
2456 | +fi |
2457 | + |
2458 | +if [ "$1" = "configure" ]; then |
2459 | + create_log_dir |
2460 | + |
2461 | + configure_maas_tgt |
2462 | + configure_maas_url |
2463 | + # Only ask for a shared secret when the region is not installed |
2464 | + # on the same system. |
2465 | + if [ -n "$DEBCONF_RECONFIGURE" ] && [ ! -f /usr/sbin/maas-region-admin ]; then |
2466 | + db_input high maas-cluster-controller/shared-secret |
2467 | + db_go |
2468 | + fi |
2469 | + configure_shared_secret |
2470 | + |
2471 | + # This config file may contain a private cluster UUID. Only maas |
2472 | + # can read it; only root can write it. |
2473 | + chown root:maas /etc/maas/maas_cluster.conf |
2474 | + chmod 0640 /etc/maas/maas_cluster.conf |
2475 | + |
2476 | + configure_cluster_uuid |
2477 | + configure_cluster_authbind |
2478 | + enable_apache_version_mod |
2479 | + restart_apache2 |
2480 | + maas-provision upgrade-cluster |
2481 | +fi |
2482 | + |
2483 | +db_stop |
2484 | + |
2485 | +#DEBHELPER# |
2486 | |
2487 | === added file 'debian/maas-cluster-controller.postrm' |
2488 | --- debian/maas-cluster-controller.postrm 1970-01-01 00:00:00 +0000 |
2489 | +++ debian/maas-cluster-controller.postrm 2015-06-03 20:06:06 +0000 |
2490 | @@ -0,0 +1,29 @@ |
2491 | +#!/bin/sh |
2492 | + |
2493 | +set -e |
2494 | + |
2495 | +#DEBHELPER# |
2496 | + |
2497 | +RELEASE=`lsb_release -rs` || RELEASE="" |
2498 | + |
2499 | +case "$1" in |
2500 | + purge) |
2501 | + # remove log directory |
2502 | + rm -rf /var/log/maas |
2503 | + # remove var directory |
2504 | + DIR=/var/lib/maas |
2505 | + if [ "$(ls -A $DIR 2> /dev/null)" = "" ]; then |
2506 | + rm -rf /var/lib/maas |
2507 | + fi |
2508 | + |
2509 | + # Delete symlink for iSCSI config. |
2510 | + if [ -L /etc/tgt/conf.d/maas.conf ]; then |
2511 | + rm -rf /etc/tgt/conf.d/maas.conf |
2512 | + fi |
2513 | + |
2514 | + # Remove authbind |
2515 | + MAAS_UID="`id -u maas`" |
2516 | + if [ -f "/etc/authbind/byuid/$MAAS_UID" ]; then |
2517 | + rm -rf /etc/authbind/byuid/$MAAS_UID |
2518 | + fi |
2519 | +esac |
2520 | |
2521 | === added file 'debian/maas-cluster-controller.preinst' |
2522 | --- debian/maas-cluster-controller.preinst 1970-01-01 00:00:00 +0000 |
2523 | +++ debian/maas-cluster-controller.preinst 2015-06-03 20:06:06 +0000 |
2524 | @@ -0,0 +1,43 @@ |
2525 | +#!/bin/sh |
2526 | + |
2527 | +set -e |
2528 | + |
2529 | +. /usr/share/debconf/confmodule |
2530 | + |
2531 | +if [ "$1" = "upgrade" ]; then |
2532 | + |
2533 | + if dpkg --compare-versions "$2" lt 1.7.0~beta3+bzr3066-0ubuntu1; then |
2534 | + if [ -f /etc/init/maas-pserv.conf ]; then |
2535 | + invoke-rc.d maas-pserv stop |
2536 | + fi |
2537 | + |
2538 | + if [ -f /etc/init/maas-cluster-celery.conf ]; then |
2539 | + invoke-rc.d maas-cluster-celery stop |
2540 | + fi |
2541 | + |
2542 | + if [ -f /var/log/maas/celery.log ]; then |
2543 | + rm -rf /var/log/maas/celery.log |
2544 | + fi |
2545 | + fi |
2546 | + |
2547 | + if dpkg --compare-versions "$2" lt 1.7.0~beta6+bzr3232-0ubuntu1; then |
2548 | + if [ -f /etc/init/maas-cluster.conf ]; then |
2549 | + invoke-rc.d maas-cluster stop |
2550 | + fi |
2551 | + fi |
2552 | + |
2553 | + if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3486-0ubuntu1; then |
2554 | + if [ -f /var/log/maas/pserv.log ]; then |
2555 | + rm -rf /var/log/maas/pserv.log |
2556 | + fi |
2557 | + fi |
2558 | + |
2559 | + if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3523-0ubuntu1; then |
2560 | + if [ -f /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then |
2561 | + rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf |
2562 | + fi |
2563 | + fi |
2564 | + |
2565 | +fi |
2566 | + |
2567 | +#DEBHELPER# |
2568 | |
2569 | === added file 'debian/maas-cluster-controller.templates' |
2570 | --- debian/maas-cluster-controller.templates 1970-01-01 00:00:00 +0000 |
2571 | +++ debian/maas-cluster-controller.templates 2015-06-03 20:06:06 +0000 |
2572 | @@ -0,0 +1,16 @@ |
2573 | +Template: maas-cluster-controller/maas-url |
2574 | +Type: string |
2575 | +Default: |
2576 | +_Description: Ubuntu MAAS API address: |
2577 | + The MAAS cluster controller and nodes need to contact the MAAS region |
2578 | + controller API. Set the URL at which they can reach the MAAS API remotely, |
2579 | + e.g. "http://192.168.1.1/MAAS". |
2580 | + Since nodes must be able to access this URL, localhost or 127.0.0.1 are not |
2581 | + useful values here. |
2582 | + |
2583 | +Template: maas-cluster-controller/shared-secret |
2584 | +Type: password |
2585 | +Default: |
2586 | +_Description: MAAS Cluster Controller Shared Secret: |
2587 | + The MAAS Cluster Controller needs to contact the MAAS server |
2588 | + with a share secret. Set the shared secret here. |
2589 | |
2590 | === added file 'debian/maas-common.install' |
2591 | --- debian/maas-common.install 1970-01-01 00:00:00 +0000 |
2592 | +++ debian/maas-common.install 2015-06-03 20:06:06 +0000 |
2593 | @@ -0,0 +1,1 @@ |
2594 | +debian/tmp/usr/share/maas/maas-rsyslog.conf |
2595 | |
2596 | === added file 'debian/maas-common.logrotate' |
2597 | --- debian/maas-common.logrotate 1970-01-01 00:00:00 +0000 |
2598 | +++ debian/maas-common.logrotate 2015-06-03 20:06:06 +0000 |
2599 | @@ -0,0 +1,9 @@ |
2600 | +/var/log/maas/maas.log |
2601 | +{ |
2602 | + rotate 7 |
2603 | + daily |
2604 | + missingok |
2605 | + notifempty |
2606 | + delaycompress |
2607 | + compress |
2608 | +} |
2609 | |
2610 | === added file 'debian/maas-common.maintscript' |
2611 | --- debian/maas-common.maintscript 1970-01-01 00:00:00 +0000 |
2612 | +++ debian/maas-common.maintscript 2015-06-03 20:06:06 +0000 |
2613 | @@ -0,0 +1,2 @@ |
2614 | +#TODO: Figure out the right version or whether this is needed. |
2615 | +#rm_conffile /usr/share/maas/celeryconfig_common.py 1.7.0~beta3+bzr3043-0ubuntu1 |
2616 | |
2617 | === added file 'debian/maas-common.postinst' |
2618 | --- debian/maas-common.postinst 1970-01-01 00:00:00 +0000 |
2619 | +++ debian/maas-common.postinst 2015-06-03 20:06:06 +0000 |
2620 | @@ -0,0 +1,31 @@ |
2621 | +#!/bin/sh |
2622 | + |
2623 | +set -e |
2624 | + |
2625 | +create_log_dir(){ |
2626 | + # Logging directory (/var/log/maas) |
2627 | + if [ ! -d /var/log/maas ]; then |
2628 | + mkdir -p /var/log/maas |
2629 | + chown -R maas:maas /var/log/maas/ |
2630 | + fi |
2631 | + |
2632 | + if [ ! -f /var/log/maas/maas.log ]; then |
2633 | + touch /var/log/maas/maas.log |
2634 | + fi |
2635 | + chown syslog:syslog /var/log/maas/maas.log |
2636 | +} |
2637 | + |
2638 | +add_user_group(){ |
2639 | + local user="maas" |
2640 | + local group="maas" |
2641 | + local home="/var/lib/maas" |
2642 | + addgroup --quiet --system "$group" || true |
2643 | + adduser --quiet --system --group --home "$home" "$user" || true |
2644 | +} |
2645 | + |
2646 | +ln -sf /usr/share/maas/maas-rsyslog.conf /etc/rsyslog.d/99-maas.conf |
2647 | + |
2648 | +add_user_group |
2649 | +create_log_dir |
2650 | + |
2651 | +#DEBHELPER# |
2652 | |
2653 | === added file 'debian/maas-common.postrm' |
2654 | --- debian/maas-common.postrm 1970-01-01 00:00:00 +0000 |
2655 | +++ debian/maas-common.postrm 2015-06-03 20:06:06 +0000 |
2656 | @@ -0,0 +1,17 @@ |
2657 | +#!/bin/sh |
2658 | + |
2659 | +set -e |
2660 | + |
2661 | +case "$1" in |
2662 | + purge) |
2663 | + # Deleting user/group |
2664 | + if getent passwd maas >/dev/null; then |
2665 | + deluser maas || true |
2666 | + delgroup maas || true |
2667 | + fi |
2668 | +esac |
2669 | + |
2670 | +rm -f /etc/rsyslog.d/99-maas.conf |
2671 | + |
2672 | + |
2673 | +#DEBHELPER# |
2674 | |
2675 | === added file 'debian/maas-dhcp.apparmor' |
2676 | --- debian/maas-dhcp.apparmor 1970-01-01 00:00:00 +0000 |
2677 | +++ debian/maas-dhcp.apparmor 2015-06-03 20:06:06 +0000 |
2678 | @@ -0,0 +1,12 @@ |
2679 | +# Work around bug: |
2680 | +# https://bugs.launchpad.net/ubuntu/+source/isc-dhcp/+bug/1186662 |
2681 | +capability dac_override, |
2682 | + |
2683 | +/run/maas/dhcp/ r, |
2684 | +/run/maas/dhcp/** r, |
2685 | +/run/maas/dhcp/*.pid lrw, |
2686 | +/run/maas/dhcp/*.trace lrw, |
2687 | +/run/maas/dhcp/*.leases* lrw, |
2688 | +/var/lib/maas/dhcp/dhcpd*.leases* lrw, |
2689 | +/etc/maas/dhcpd.conf r, |
2690 | +/etc/maas/dhcpd6.conf r, |
2691 | |
2692 | === added file 'debian/maas-dhcp.install' |
2693 | --- debian/maas-dhcp.install 1970-01-01 00:00:00 +0000 |
2694 | +++ debian/maas-dhcp.install 2015-06-03 20:06:06 +0000 |
2695 | @@ -0,0 +1,1 @@ |
2696 | +/debian/tmp/etc/apparmor.d/dhcpd.d/maas |
2697 | |
2698 | === added file 'debian/maas-dhcp.maas-dhcpd.service' |
2699 | --- debian/maas-dhcp.maas-dhcpd.service 1970-01-01 00:00:00 +0000 |
2700 | +++ debian/maas-dhcp.maas-dhcpd.service 2015-06-03 20:06:06 +0000 |
2701 | @@ -0,0 +1,27 @@ |
2702 | +[Unit] |
2703 | +Description=MAAS instance of ISC DHCP server for IPv4 |
2704 | +Documentation=man:dhcpd(8) |
2705 | +Wants=network-online.target |
2706 | +After=network-online.target |
2707 | +After=time-sync.target |
2708 | +ConditionPathExists=/etc/maas/dhcpd.conf |
2709 | +ConditionPathExists=/var/lib/maas/dhcpd-interfaces |
2710 | + |
2711 | +[Service] |
2712 | +# Allow dhcp server to write lease and pid file as 'dhcpd' user |
2713 | +ExecStartPre=/bin/mkdir -p /run/maas/dhcp |
2714 | +ExecStartPre=/bin/chown root:root /run/maas/dhcp |
2715 | +# The leases files need to be root:root even when dropping privileges |
2716 | +ExecStartPre=/bin/mkdir -p /var/lib/maas/dhcp |
2717 | +ExecStartPre=/bin/chown root:root /var/lib/maas/dhcp |
2718 | +# Start the daemon |
2719 | +ExecStart=/bin/sh -ec '\ |
2720 | + INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \ |
2721 | + LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases; \ |
2722 | + [ -e $LEASES_FILE ] || touch $LEASES_FILE; \ |
2723 | + chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd.leases*; \ |
2724 | + exec dhcpd -user dhcpd -group dhcpd -f -q -4 -pf /run/maas/dhcp/dhcpd.pid \ |
2725 | + -cf /etc/maas/dhcpd.conf -lf $LEASES_FILE $INTERFACES' |
2726 | + |
2727 | +[Install] |
2728 | +WantedBy=multi-user.target |
2729 | |
2730 | === added file 'debian/maas-dhcp.maas-dhcpd.upstart' |
2731 | --- debian/maas-dhcp.maas-dhcpd.upstart 1970-01-01 00:00:00 +0000 |
2732 | +++ debian/maas-dhcp.maas-dhcpd.upstart 2015-06-03 20:06:06 +0000 |
2733 | @@ -0,0 +1,65 @@ |
2734 | +description "MAAS instance of ISC DHCP server for IPv4" |
2735 | +author "Jeroen Vermeulen <jtv@canonical.com>" |
2736 | + |
2737 | +start on runlevel [2345] |
2738 | +stop on runlevel [!2345] |
2739 | + |
2740 | +env CONFIG_FILE=/etc/maas/dhcpd.conf |
2741 | +env PID_DIR=/run/maas/dhcp |
2742 | +env PID_FILE=/run/maas/dhcp/dhcpd.pid |
2743 | +env LEASES_DIR=/var/lib/maas/dhcp |
2744 | +env LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases |
2745 | + |
2746 | +# This is where we write what interfaces dhcpd should listen on. |
2747 | +env INTERFACES_FILE=/var/lib/maas/dhcpd-interfaces |
2748 | + |
2749 | +pre-start script |
2750 | + if [ ! -f $CONFIG_FILE ]; then |
2751 | + echo "$CONFIG_FILE does not exist. Aborting." |
2752 | + stop |
2753 | + exit 0 |
2754 | + fi |
2755 | + |
2756 | + if [ ! -f $INTERFACES_FILE ]; then |
2757 | + echo "$INTERFACES_FILE does not exist. Aborting." |
2758 | + stop |
2759 | + exit 0 |
2760 | + fi |
2761 | + |
2762 | + if ! /usr/sbin/dhcpd -t -q -4 -cf $CONFIG_FILE > /dev/null 2>&1; then |
2763 | + echo "dhcpd self-test failed. Please fix the config file." |
2764 | + echo "The error was: " |
2765 | + /usr/sbin/dhcpd -t -4 -cf $CONFIG_FILE |
2766 | + stop |
2767 | + exit 0 |
2768 | + fi |
2769 | +end script |
2770 | + |
2771 | +respawn |
2772 | +script |
2773 | + INTERFACES=`cat "${INTERFACES_FILE}"` |
2774 | + |
2775 | + # Allow dhcp server to write lease and pid file. |
2776 | + mkdir -p $PID_DIR |
2777 | + chown dhcpd:dhcpd $PID_DIR |
2778 | + |
2779 | + # As of Quantal, the leases file must be owned by root:root (even though |
2780 | + # the daemon will run under an unprivileged user). |
2781 | + # In Precise, ownership was supposed to be dhcpd:dhcpd. |
2782 | + # |
2783 | + # maas packages on saucy are only supported with newer isc-dhcp via |
2784 | + # the cloud-archive. See bug 1231693 for more information, including |
2785 | + # a patch that would actually work to support all, but is complex. |
2786 | + |
2787 | + mkdir -p $LEASES_DIR |
2788 | + chown root:root $LEASES_DIR |
2789 | + [ -e $LEASES_FILE ] || touch $LEASES_FILE |
2790 | + for LFILE in $LEASES_FILE $LEASES_FILE~; do |
2791 | + if [ -e $LFILE ]; then |
2792 | + chown root:root $LFILE |
2793 | + chmod a+r $LFILE |
2794 | + fi |
2795 | + done |
2796 | + |
2797 | + exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES |
2798 | +end script |
2799 | |
2800 | === added file 'debian/maas-dhcp.maas-dhcpd6.service' |
2801 | --- debian/maas-dhcp.maas-dhcpd6.service 1970-01-01 00:00:00 +0000 |
2802 | +++ debian/maas-dhcp.maas-dhcpd6.service 2015-06-03 20:06:06 +0000 |
2803 | @@ -0,0 +1,27 @@ |
2804 | +[Unit] |
2805 | +Description=MAAS instance of ISC DHCP server for IPv6 |
2806 | +Documentation=man:dhcpd(8) |
2807 | +Wants=network-online.target |
2808 | +After=network-online.target |
2809 | +After=time-sync.target |
2810 | +ConditionPathExists=/etc/maas/dhcpd6.conf |
2811 | +ConditionPathExists=/var/lib/maas/dhcpd-interfaces |
2812 | + |
2813 | +[Service] |
2814 | +# Allow dhcp server to write lease and pid file as 'dhcpd' user |
2815 | +ExecStartPre=/bin/mkdir -p /run/maas/dhcp |
2816 | +ExecStartPre=/bin/chown root:root /run/maas/dhcp |
2817 | +# The leases files need to be root:root even when dropping privileges |
2818 | +ExecStartPre=/bin/mkdir -p /var/lib/maas/dhcp |
2819 | +ExecStartPre=/bin/chown root:root /var/lib/maas/dhcp |
2820 | +# Start the daemon |
2821 | +ExecStart=/bin/sh -ec '\ |
2822 | + INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \ |
2823 | + LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases; \ |
2824 | + [ -e $LEASES_FILE ] || touch $LEASES_FILE; \ |
2825 | + chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd6.leases*; \ |
2826 | + exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid \ |
2827 | + -cf /etc/maas/dhcpd6.conf -lf $LEASES_FILE $INTERFACES' |
2828 | + |
2829 | +[Install] |
2830 | +WantedBy=multi-user.target |
2831 | |
2832 | === added file 'debian/maas-dhcp.maas-dhcpd6.upstart' |
2833 | --- debian/maas-dhcp.maas-dhcpd6.upstart 1970-01-01 00:00:00 +0000 |
2834 | +++ debian/maas-dhcp.maas-dhcpd6.upstart 2015-06-03 20:06:06 +0000 |
2835 | @@ -0,0 +1,65 @@ |
2836 | +description "MAAS instance of ISC DHCP server for IPv6" |
2837 | +author "Jeroen Vermeulen <jtv@canonical.com>" |
2838 | + |
2839 | +start on runlevel [2345] |
2840 | +stop on runlevel [!2345] |
2841 | + |
2842 | +env CONFIG_FILE=/etc/maas/dhcpd6.conf |
2843 | +env PID_DIR=/run/maas/dhcp |
2844 | +env PID_FILE=/run/maas/dhcp/dhcpd6.pid |
2845 | +env LEASES_DIR=/var/lib/maas/dhcp |
2846 | +env LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases |
2847 | + |
2848 | +# This is where we write what interfaces dhcpd should listen on. |
2849 | +env INTERFACES_FILE=/var/lib/maas/dhcpd6-interfaces |
2850 | + |
2851 | +pre-start script |
2852 | + if [ ! -f $CONFIG_FILE ]; then |
2853 | + echo "$CONFIG_FILE does not exist. Aborting." |
2854 | + stop |
2855 | + exit 0 |
2856 | + fi |
2857 | + |
2858 | + if [ ! -f $INTERFACES_FILE ]; then |
2859 | + echo "$INTERFACES_FILE does not exist. Aborting." |
2860 | + stop |
2861 | + exit 0 |
2862 | + fi |
2863 | + |
2864 | + if ! /usr/sbin/dhcpd -t -q -6 -cf $CONFIG_FILE > /dev/null 2>&1; then |
2865 | + echo "dhcpd self-test failed. Please fix the config file." |
2866 | + echo "The error was: " |
2867 | + /usr/sbin/dhcpd -t -6 -cf $CONFIG_FILE |
2868 | + stop |
2869 | + exit 0 |
2870 | + fi |
2871 | +end script |
2872 | + |
2873 | +respawn |
2874 | +script |
2875 | + INTERFACES=`cat "${INTERFACES_FILE}"` |
2876 | + |
2877 | + # Allow dhcp server to write lease and pid file. |
2878 | + mkdir -p $PID_DIR |
2879 | + chown dhcpd:dhcpd $PID_DIR |
2880 | + |
2881 | + # As of Quantal, the leases file must be owned by root:root (even though |
2882 | + # the daemon will run under an unprivileged user). |
2883 | + # In Precise, ownership was supposed to be dhcpd:dhcpd. |
2884 | + # |
2885 | + # maas packages on saucy are only supported with newer isc-dhcp via |
2886 | + # the cloud-archive. See bug 1231693 for more information, including |
2887 | + # a patch that would actually work to support all, but is complex. |
2888 | + |
2889 | + mkdir -p $LEASES_DIR |
2890 | + chown root:root $LEASES_DIR |
2891 | + [ -e $LEASES_FILE ] || touch $LEASES_FILE |
2892 | + for LFILE in $LEASES_FILE $LEASES_FILE~; do |
2893 | + if [ -e $LFILE ]; then |
2894 | + chown root:root $LFILE |
2895 | + chmod a+r $LFILE |
2896 | + fi |
2897 | + done |
2898 | + |
2899 | + exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -6 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES |
2900 | +end script |
2901 | |
2902 | === added file 'debian/maas-dhcp.maintscript' |
2903 | --- debian/maas-dhcp.maintscript 1970-01-01 00:00:00 +0000 |
2904 | +++ debian/maas-dhcp.maintscript 2015-06-03 20:06:06 +0000 |
2905 | @@ -0,0 +1,2 @@ |
2906 | +rm_conffile /etc/init/maas-dhcp-server.conf 1.7.0~beta6+bzr3231-0ubuntu1 |
2907 | +rm_conffile /etc/init/maas-dhcpv6-server.conf 1.7.0~beta6+bzr3231-0ubuntu1 |
2908 | |
2909 | === added file 'debian/maas-dhcp.postinst' |
2910 | --- debian/maas-dhcp.postinst 1970-01-01 00:00:00 +0000 |
2911 | +++ debian/maas-dhcp.postinst 2015-06-03 20:06:06 +0000 |
2912 | @@ -0,0 +1,23 @@ |
2913 | +#!/bin/sh |
2914 | + |
2915 | +set -e |
2916 | + |
2917 | +if [ "$1" = "configure" ] |
2918 | +then |
2919 | + # Stop the dhcpd instance that came with the isc-dhcp-server package. |
2920 | + # We run our own dhcpd instances. |
2921 | + if [ -d /run/systemd/system ]; then |
2922 | + systemctl stop isc-dhcp-server >/dev/null || true |
2923 | + systemctl disable isc-dhcp-server >/dev/null || true |
2924 | + else |
2925 | + invoke-rc.d isc-dhcp-server stop |
2926 | + fi |
2927 | + |
2928 | + dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd" |
2929 | + if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1 |
2930 | + then |
2931 | + apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" || true |
2932 | + fi |
2933 | +fi |
2934 | + |
2935 | +#DEBHELPER# |
2936 | |
2937 | === added file 'debian/maas-dhcp.postrm' |
2938 | --- debian/maas-dhcp.postrm 1970-01-01 00:00:00 +0000 |
2939 | +++ debian/maas-dhcp.postrm 2015-06-03 20:06:06 +0000 |
2940 | @@ -0,0 +1,17 @@ |
2941 | +#!/bin/sh |
2942 | + |
2943 | +set -e |
2944 | + |
2945 | +if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then |
2946 | + dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd" |
2947 | + if [ -f "${dhcpd_prof}" ] && |
2948 | + command -v apparmor_parser >/dev/null 2>&1; then |
2949 | + apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" |
2950 | + fi |
2951 | + if [ "$1" = "purge" ]; then |
2952 | + rm -rf /etc/maas/dhcpd.conf |
2953 | + rm -rf /etc/maas/dhcpd6.conf |
2954 | + fi |
2955 | +fi |
2956 | + |
2957 | +#DEBHELPER# |
2958 | |
2959 | === added file 'debian/maas-dhcp.preinst' |
2960 | --- debian/maas-dhcp.preinst 1970-01-01 00:00:00 +0000 |
2961 | +++ debian/maas-dhcp.preinst 2015-06-03 20:06:06 +0000 |
2962 | @@ -0,0 +1,16 @@ |
2963 | +#!/bin/sh |
2964 | + |
2965 | +set -e |
2966 | + |
2967 | +. /usr/share/debconf/confmodule |
2968 | + |
2969 | +if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.7.0~beta6+bzr3232-0ubuntu1; then |
2970 | + if [ -f /etc/init/maas-dhcp-server.conf ]; then |
2971 | + invoke-rc.d maas-dhcp-server stop |
2972 | + fi |
2973 | + if [ -f /etc/init/maas-dhcpv6-server.conf ]; then |
2974 | + invoke-rc.d maas-dhcpv6-server stop |
2975 | + fi |
2976 | +fi |
2977 | + |
2978 | +#DEBHELPER# |
2979 | |
2980 | === added file 'debian/maas-dns.dirs' |
2981 | --- debian/maas-dns.dirs 1970-01-01 00:00:00 +0000 |
2982 | +++ debian/maas-dns.dirs 2015-06-03 20:06:06 +0000 |
2983 | @@ -0,0 +1,1 @@ |
2984 | +etc/bind/maas |
2985 | |
2986 | === added file 'debian/maas-dns.postinst' |
2987 | --- debian/maas-dns.postinst 1970-01-01 00:00:00 +0000 |
2988 | +++ debian/maas-dns.postinst 2015-06-03 20:06:06 +0000 |
2989 | @@ -0,0 +1,78 @@ |
2990 | +#!/bin/sh |
2991 | + |
2992 | +set -e |
2993 | + |
2994 | +edit_named_options() { |
2995 | + # Remove any existing MAAS-related include line from |
2996 | + # /etc/bind/named.conf.local, then re-add it. |
2997 | + sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local |
2998 | + maas-region-admin get_named_conf --edit --config_path /etc/bind/named.conf.local |
2999 | + |
3000 | + # Add a line in /etc/bind/named.conf.options that includes the |
3001 | + # /etc/named/maas/named.conf.options.inside.maas file. |
3002 | + maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options |
3003 | +} |
3004 | + |
3005 | +fix_dns_permissions() { |
3006 | + if [ -d /etc/bind/maas ]; then |
3007 | + chown maas:root /etc/bind/maas |
3008 | + chown -R maas:maas /etc/bind/maas/* |
3009 | + fi |
3010 | + if [ -f /etc/bind/maas/named.conf.maas ]; then |
3011 | + chown maas:maas /etc/bind/maas/named.conf.maas |
3012 | + chmod 644 /etc/bind/maas/named.conf.maas |
3013 | + fi |
3014 | + if [ -f /etc/bind/maas/named.conf.options.inside.maas ]; then |
3015 | + chown maas:maas /etc/bind/maas/named.conf.options.inside.maas |
3016 | + chmod 644 /etc/bind/maas/named.conf.options.inside.maas |
3017 | + fi |
3018 | + if [ -f /etc/bind/maas/rndc.conf.maas ]; then |
3019 | + chown maas:root /etc/bind/maas/rndc.conf.maas |
3020 | + chmod 600 /etc/bind/maas/rndc.conf.maas |
3021 | + fi |
3022 | + if [ -f /etc/bind/maas/named.conf.rndc.maas ]; then |
3023 | + chown maas:bind /etc/bind/maas/named.conf.rndc.maas |
3024 | + chmod 640 /etc/bind/maas/named.conf.rndc.maas |
3025 | + fi |
3026 | +} |
3027 | + |
3028 | +# This handles installs and re-configuration |
3029 | +if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then |
3030 | + # If /etc/bind/maas is empty, set_up_dns. |
3031 | + if [ ! "$(ls -A /etc/bind/maas)" ]; then |
3032 | + maas-region-admin set_up_dns |
3033 | + fi |
3034 | + |
3035 | + # Fix permissions. |
3036 | + fix_dns_permissions |
3037 | + |
3038 | + edit_named_options |
3039 | + |
3040 | +elif [ "$1" = "configure" ]; then |
3041 | + # Fix permissions |
3042 | + fix_dns_permissions |
3043 | + |
3044 | + # If the /etc/bind/named.conf.options is not set up yet, do it now. |
3045 | + # This might happen because of an upgrade from an older package. |
3046 | + should_edit_named_options=0 |
3047 | + |
3048 | + # If the MAAS include statement doesn't exist in named.conf.local, we need to add it. |
3049 | + grep -qs '^include\s.*maas' /etc/bind/named.conf.local || should_edit_named_options=1 |
3050 | + |
3051 | + # If the 'forwarders' option exists in named.conf.options, it needs to be removed. |
3052 | + grep -qs "forwarders" /etc/bind/named.conf.options && should_edit_named_options=1 |
3053 | + |
3054 | + # If the 'dnssec-validation' option exists in named.conf.options, it needs to be removed. |
3055 | + grep -qs "dnssec-validation" /etc/bind/named.conf.options && should_edit_named_options=1 |
3056 | + |
3057 | + # If the include file for the custom MAAS named.conf.options doesn't exist, it needs to be added. |
3058 | + grep -qs "named.conf.options.inside.maas" /etc/bind/named.conf.options || should_edit_named_options=1 |
3059 | + |
3060 | + if [ $should_edit_named_options -eq 1 ]; then |
3061 | + edit_named_options |
3062 | + fi |
3063 | +fi |
3064 | + |
3065 | +invoke-rc.d bind9 restart || true |
3066 | + |
3067 | +#DEBHELPER# |
3068 | |
3069 | === added file 'debian/maas-dns.postrm' |
3070 | --- debian/maas-dns.postrm 1970-01-01 00:00:00 +0000 |
3071 | +++ debian/maas-dns.postrm 2015-06-03 20:06:06 +0000 |
3072 | @@ -0,0 +1,25 @@ |
3073 | +#!/bin/sh |
3074 | + |
3075 | +set -e |
3076 | + |
3077 | +if [ "$1" = "remove" ]; then |
3078 | + if [ -f /etc/bind/named.conf.local ]; then |
3079 | + sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.maas\"\;$/d' \ |
3080 | + /etc/bind/named.conf.local |
3081 | + sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.options.inside.maas\"\;$/d' \ |
3082 | + /etc/bind/named.conf.options |
3083 | + fi |
3084 | +fi |
3085 | + |
3086 | +if [ "$1" = "purge" ]; then |
3087 | + # Remove zone files |
3088 | + if [ -d /etc/bind/maas ]; then |
3089 | + rm -rf /etc/bind/maas |
3090 | + fi |
3091 | +fi |
3092 | + |
3093 | +if [ -x /usr/sbin/invoke-rc.d ]; then |
3094 | + invoke-rc.d bind9 restart || true |
3095 | +fi |
3096 | + |
3097 | +#DEBHELPER# |
3098 | |
3099 | === added file 'debian/maas-proxy.dirs' |
3100 | --- debian/maas-proxy.dirs 1970-01-01 00:00:00 +0000 |
3101 | +++ debian/maas-proxy.dirs 2015-06-03 20:06:06 +0000 |
3102 | @@ -0,0 +1,1 @@ |
3103 | +var/log/maas/proxy |
3104 | |
3105 | === added file 'debian/maas-proxy.install' |
3106 | --- debian/maas-proxy.install 1970-01-01 00:00:00 +0000 |
3107 | +++ debian/maas-proxy.install 2015-06-03 20:06:06 +0000 |
3108 | @@ -0,0 +1,3 @@ |
3109 | +debian/extras/maas-proxy.conf etc/maas/ |
3110 | +debian/extras/maas-proxy-common.sh usr/share/maas/ |
3111 | +debian/extras/squid3.override etc/init/ |
3112 | |
3113 | === added file 'debian/maas-proxy.logrotate' |
3114 | --- debian/maas-proxy.logrotate 1970-01-01 00:00:00 +0000 |
3115 | +++ debian/maas-proxy.logrotate 2015-06-03 20:06:06 +0000 |
3116 | @@ -0,0 +1,24 @@ |
3117 | +# |
3118 | +# Logrotate fragment for squid-deb-proxy. |
3119 | +# |
3120 | +/var/log/maas/proxy/*.log { |
3121 | + daily |
3122 | + compress |
3123 | + delaycompress |
3124 | + rotate 2 |
3125 | + missingok |
3126 | + nocreate |
3127 | + sharedscripts |
3128 | + postrotate |
3129 | + if [ -x /usr/sbin/squid ]; then |
3130 | + SQUID=/usr/sbin/squid |
3131 | + elif [ -x /usr/sbin/squid3 ]; then |
3132 | + SQUID=/usr/sbin/squid3 |
3133 | + else |
3134 | + echo "No squid binary found" |
3135 | + exit 1 |
3136 | + fi |
3137 | + |
3138 | + test ! -e /var/run/maas-proxy.pid || $SQUID -f /etc/maas/maas-proxy.conf -k rotate |
3139 | + endscript |
3140 | +} |
3141 | |
3142 | === added file 'debian/maas-proxy.maas-proxy.service' |
3143 | --- debian/maas-proxy.maas-proxy.service 1970-01-01 00:00:00 +0000 |
3144 | +++ debian/maas-proxy.maas-proxy.service 2015-06-03 20:06:06 +0000 |
3145 | @@ -0,0 +1,15 @@ |
3146 | +[Unit] |
3147 | +Description=MAAS Proxy |
3148 | +Requires=network-online.target |
3149 | +After=network-online.target |
3150 | +ConditionPathExists=/etc/maas/maas-proxy.conf |
3151 | + |
3152 | +[Service] |
3153 | +ExecStartPre=/bin/mkdir -p /run/maas/proxy |
3154 | +ExecStartPre=/bin/sh -ec '\ |
3155 | + . /usr/share/maas/maas-proxy-common.sh; \ |
3156 | + pre_start' |
3157 | +ExecStart=/usr/sbin/squid3 -N -f /etc/maas/maas-proxy.conf |
3158 | + |
3159 | +[Install] |
3160 | +WantedBy=multi-user.target |
3161 | |
3162 | === added file 'debian/maas-proxy.maas-proxy.upstart' |
3163 | --- debian/maas-proxy.maas-proxy.upstart 1970-01-01 00:00:00 +0000 |
3164 | +++ debian/maas-proxy.maas-proxy.upstart 2015-06-03 20:06:06 +0000 |
3165 | @@ -0,0 +1,24 @@ |
3166 | +# maas-proxy - a caching proxy |
3167 | +# |
3168 | + |
3169 | +description "maas-proxy" |
3170 | + |
3171 | +start on (local-filesystems and net-device-up IFACE!=lo) |
3172 | +stop on runlevel [!2345] |
3173 | + |
3174 | +pre-start script |
3175 | + . /usr/share/maas/maas-proxy-common.sh |
3176 | + pre_start |
3177 | +end script |
3178 | + |
3179 | +script |
3180 | + if [ -x /usr/sbin/squid ]; then |
3181 | + SQUID=/usr/sbin/squid |
3182 | + elif [ -x /usr/sbin/squid3 ]; then |
3183 | + SQUID=/usr/sbin/squid3 |
3184 | + else |
3185 | + echo "No squid binary found" |
3186 | + exit 1 |
3187 | + fi |
3188 | + exec $SQUID -N -f /etc/maas/maas-proxy.conf |
3189 | +end script |
3190 | |
3191 | === added file 'debian/maas-proxy.postinst' |
3192 | --- debian/maas-proxy.postinst 1970-01-01 00:00:00 +0000 |
3193 | +++ debian/maas-proxy.postinst 2015-06-03 20:06:06 +0000 |
3194 | @@ -0,0 +1,22 @@ |
3195 | +#!/bin/sh |
3196 | + |
3197 | +set -e |
3198 | + |
3199 | +if [ "$1" = "configure" ] |
3200 | +then |
3201 | + # Stop the squid3 instance that came with the isc-dhcp-server package. |
3202 | + # We run our own squid3 instances. |
3203 | + if [ -d /run/systemd/system ]; then |
3204 | + systemctl stop squid3 >/dev/null || true |
3205 | + systemctl disable squid3 >/dev/null || true |
3206 | + else |
3207 | + invoke-rc.d squid3 stop |
3208 | + fi |
3209 | + |
3210 | + # Ensure log folder is created. |
3211 | + mkdir -p /var/log/maas/proxy |
3212 | + chown -R proxy:proxy /var/log/maas/proxy |
3213 | + |
3214 | +fi |
3215 | + |
3216 | +#DEBHELPER# |
3217 | |
3218 | === added file 'debian/maas-proxy.postrm' |
3219 | --- debian/maas-proxy.postrm 1970-01-01 00:00:00 +0000 |
3220 | +++ debian/maas-proxy.postrm 2015-06-03 20:06:06 +0000 |
3221 | @@ -0,0 +1,12 @@ |
3222 | +#!/bin/sh |
3223 | + |
3224 | +set -e |
3225 | + |
3226 | +if [ "$1" = "purge" ]; then |
3227 | + rm -rf /var/cache/maas-proxy |
3228 | + rm -rf /var/log/maas/proxy |
3229 | + rm -rf /var/spool/maas-proxy |
3230 | + rm -f /etc/maas/maas-proxy.conf |
3231 | +fi |
3232 | + |
3233 | +#DEBHELPER# |
3234 | |
3235 | === added file 'debian/maas-region-controller-min.apport' |
3236 | --- debian/maas-region-controller-min.apport 1970-01-01 00:00:00 +0000 |
3237 | +++ debian/maas-region-controller-min.apport 2015-06-03 20:06:06 +0000 |
3238 | @@ -0,0 +1,63 @@ |
3239 | +#!/usr/bin/python |
3240 | + |
3241 | +'''apport hook for maas-region-controller |
3242 | + |
3243 | +(c) 2012-2014 Canonical Ltd. |
3244 | +Author: Andres Rodriguez <andres.rodriguez@canonical.com> |
3245 | + |
3246 | +This program is free software; you can redistribute it and/or modify it |
3247 | +under the terms of the GNU General Public License as published by the |
3248 | +Free Software Foundation; either version 2 of the License, or (at your |
3249 | +option) any later version. See http://www.gnu.org/copyleft/gpl.html for |
3250 | +the full text of the license. |
3251 | +''' |
3252 | + |
3253 | +import os.path |
3254 | +import subprocess |
3255 | +import tempfile |
3256 | + |
3257 | +from apport.hookutils import ( |
3258 | + attach_conffiles, |
3259 | + attach_file, |
3260 | + attach_file_if_exists, |
3261 | + attach_related_packages, |
3262 | +) |
3263 | + |
3264 | + |
3265 | +def attach_journal_logs(report, key, *units): |
3266 | + """Capture logs from systemd's journal.""" |
3267 | + if os.path.exists("/bin/journalctl"): |
3268 | + cmd = ['/bin/journalctl', '--utc', '--since=-24hours'] |
3269 | + cmd.extend("--unit=%s" % unit for unit in units) |
3270 | + with tempfile.NamedTemporaryFile() as logfile: |
3271 | + subprocess.call(cmd, stdout=logfile, stderr=logfile) |
3272 | + attach_file(report, logfile.name, key) |
3273 | + |
3274 | + |
3275 | +def add_info(report, ui): |
3276 | + response = ui.yesno( |
3277 | + "The contents of your /etc/maas/maas_local_settings.py, " |
3278 | + "/etc/maas/pserv.yaml files may help developers diagnose your bug " |
3279 | + "more quickly. However, it may contain sensitive information. Do " |
3280 | + "you want to include it in your bug report?") |
3281 | + |
3282 | + if response is None: # user cancelled |
3283 | + raise StopIteration |
3284 | + elif response is True: |
3285 | + attach_conffiles(report, 'maas') |
3286 | + |
3287 | + # Attaching log files (Upstart). |
3288 | + attach_file_if_exists( |
3289 | + report, '/var/log/maas/regiond.log', 'MAASRegionLog') |
3290 | + attach_file_if_exists( |
3291 | + report, '/var/log/maas/clusterd.log', 'MAASClusterLog') |
3292 | + |
3293 | + # Attaching log files (systemd). These will overwrite the logs above on a |
3294 | + # system where systemd is available. |
3295 | + attach_journal_logs( |
3296 | + report, "MAASRegionLog", "maas-regiond", "maas-regiond-worker@*") |
3297 | + attach_journal_logs( |
3298 | + report, "MAASClusterLog", "maas-clusterd") |
3299 | + |
3300 | + # Attaching related packages info |
3301 | + attach_related_packages(report, ['python-django-maas', 'apparmor']) |
3302 | |
3303 | === added file 'debian/maas-region-controller-min.install' |
3304 | --- debian/maas-region-controller-min.install 1970-01-01 00:00:00 +0000 |
3305 | +++ debian/maas-region-controller-min.install 2015-06-03 20:06:06 +0000 |
3306 | @@ -0,0 +1,34 @@ |
3307 | +# Install project |
3308 | +debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas |
3309 | + |
3310 | +# Install static files |
3311 | +debian/tmp/usr/share/maas/web/static |
3312 | + |
3313 | +# Install Apache Config |
3314 | +debian/tmp/etc/maas/maas-http.conf |
3315 | + |
3316 | +# Install MAAS local settings |
3317 | +debian/tmp/etc/maas/maas_local_settings.py |
3318 | + |
3319 | +# Install new preseed files |
3320 | +debian/tmp/etc/maas/preseeds |
3321 | + |
3322 | +# Install templates |
3323 | +debian/tmp/etc/maas/templates/dns |
3324 | +debian/tmp/etc/maas/templates/commissioning-user-data |
3325 | +debian/tmp/etc/maas/templates/deployment-user-data |
3326 | + |
3327 | +# Install driver configuration file |
3328 | +debian/tmp/etc/maas/drivers.yaml |
3329 | + |
3330 | +# Install winrm certificate generation script |
3331 | +debian/tmp/usr/bin/maas-generate-winrm-cert |
3332 | + |
3333 | +# Install twisted plugins |
3334 | +twisted/plugins/maasregiond.py usr/share/pyshared/twisted/plugins |
3335 | + |
3336 | +# Install all other stuff |
3337 | +debian/extras/maas-region-admin usr/sbin |
3338 | +debian/extras/20-maas.conf etc/rsyslog.d |
3339 | +debian/extras/maas_remote_syslog_compress etc/cron.d |
3340 | +debian/extras/99-maas usr/share/maas/conf |
3341 | |
3342 | === added file 'debian/maas-region-controller-min.links' |
3343 | --- debian/maas-region-controller-min.links 1970-01-01 00:00:00 +0000 |
3344 | +++ debian/maas-region-controller-min.links 2015-06-03 20:06:06 +0000 |
3345 | @@ -0,0 +1,8 @@ |
3346 | +etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py |
3347 | + |
3348 | +# dh-systemd does not yet appear to fully grok template units, so we |
3349 | +# install unit dependencies directly instead. |
3350 | +lib/systemd/system/maas-regiond-worker@.service lib/systemd/system/maas-regiond.service.wants/maas-regiond-worker@1.service |
3351 | +lib/systemd/system/maas-regiond-worker@.service lib/systemd/system/maas-regiond.service.wants/maas-regiond-worker@2.service |
3352 | +lib/systemd/system/maas-regiond-worker@.service lib/systemd/system/maas-regiond.service.wants/maas-regiond-worker@3.service |
3353 | +lib/systemd/system/maas-regiond-worker@.service lib/systemd/system/maas-regiond.service.wants/maas-regiond-worker@4.service |
3354 | |
3355 | === added file 'debian/maas-region-controller-min.lintian-overrides' |
3356 | --- debian/maas-region-controller-min.lintian-overrides 1970-01-01 00:00:00 +0000 |
3357 | +++ debian/maas-region-controller-min.lintian-overrides 2015-06-03 20:06:06 +0000 |
3358 | @@ -0,0 +1,6 @@ |
3359 | +maas-region-controller-min: binary-without-manpage usr/sbin/maas |
3360 | +maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py |
3361 | +maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py |
3362 | +maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template |
3363 | +maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py |
3364 | +maas-region-controller-min: script-not-executable etc/maas/templates/deployment-user-data/maas_configure_interfaces.py |
3365 | |
3366 | === added file 'debian/maas-region-controller-min.logrotate' |
3367 | --- debian/maas-region-controller-min.logrotate 1970-01-01 00:00:00 +0000 |
3368 | +++ debian/maas-region-controller-min.logrotate 2015-06-03 20:06:06 +0000 |
3369 | @@ -0,0 +1,15 @@ |
3370 | +/var/log/maas/regiond.log { |
3371 | + rotate 5 |
3372 | + weekly |
3373 | + compress |
3374 | + missingok |
3375 | + # copytruncate may lose log messages at the moment of rotation, but |
3376 | + # there is no better way to integrate twistd and logrotate. |
3377 | + copytruncate |
3378 | + # The logs are all owned by the `maas` user, so drop privs. |
3379 | + su maas maas |
3380 | + # Don't rotate unless the log is at least 10MB. |
3381 | + minsize 10M |
3382 | + # Force rotation if the log grows beyond 50MB. |
3383 | + maxsize 50M |
3384 | +} |
3385 | |
3386 | === added file 'debian/maas-region-controller-min.maas-regiond-worker.upstart' |
3387 | --- debian/maas-region-controller-min.maas-regiond-worker.upstart 1970-01-01 00:00:00 +0000 |
3388 | +++ debian/maas-region-controller-min.maas-regiond-worker.upstart 2015-06-03 20:06:06 +0000 |
3389 | @@ -0,0 +1,25 @@ |
3390 | +description "MAAS Region Controller (Worker)" |
3391 | +author "Gavin Panella <gavin.panella@canonical.com>" |
3392 | + |
3393 | +# This instance job is started by the parent `maas-regiond` job, and |
3394 | +# stops when that job is stopped. This is differentiated from its |
3395 | +# siblings by the $core instance argument. |
3396 | + |
3397 | +instance $core |
3398 | + |
3399 | +stop on stopping maas-regiond |
3400 | + |
3401 | +setuid maas |
3402 | +setgid maas |
3403 | + |
3404 | +respawn |
3405 | + |
3406 | +kill timeout 15 |
3407 | + |
3408 | +env DJANGO_SETTINGS_MODULE=maas.settings |
3409 | +env PYTHONPATH=/usr/share/maas |
3410 | +env LOGFILE=/var/log/maas/regiond.log |
3411 | + |
3412 | +script |
3413 | + exec /usr/bin/twistd --nodaemon --pidfile= maas-regiond >> ${LOGFILE} 2>&1 |
3414 | +end script |
3415 | |
3416 | === added file 'debian/maas-region-controller-min.maas-regiond-worker@.service' |
3417 | --- debian/maas-region-controller-min.maas-regiond-worker@.service 1970-01-01 00:00:00 +0000 |
3418 | +++ debian/maas-region-controller-min.maas-regiond-worker@.service 2015-06-03 20:06:06 +0000 |
3419 | @@ -0,0 +1,27 @@ |
3420 | +[Unit] |
3421 | +Description=MAAS Region Controller (Worker %i) |
3422 | +Documentation=https://maas.ubuntu.com/ |
3423 | +Requires=network-online.target |
3424 | +After=network-online.target |
3425 | +Requires=postgresql.service |
3426 | +After=postgresql.service |
3427 | +PartOf=maas-regiond.service |
3428 | +# This will go away one we support new config files. |
3429 | +ConditionPathExists=/etc/maas/maas_local_settings.py |
3430 | + |
3431 | +[Service] |
3432 | +User=maas |
3433 | +Group=maas |
3434 | +Restart=always |
3435 | +Environment="DJANGO_SETTINGS_MODULE=maas.settings" |
3436 | +Environment="PYTHONPATH=/usr/share/maas:/usr/lib/django16" |
3437 | +Environment="LOGFILE=/var/log/maas/regiond.log" |
3438 | +# Logs go to the journal; read them with: |
3439 | +# journalctl -u maas-regiond-worker@* |
3440 | +# Logs also go to $LOGFILE for backward compatibility. The journal |
3441 | +# should now be preferred as $LOGFILE will be removed in MAAS 1.9. |
3442 | +ExecStart=/bin/sh -c \ |
3443 | + 'exec twistd --nodaemon --pidfile= maas-regiond 2>&1 | tee -a $LOGFILE' |
3444 | + |
3445 | +[Install] |
3446 | +WantedBy=maas-regiond.service |
3447 | |
3448 | === added file 'debian/maas-region-controller-min.maas-regiond.service' |
3449 | --- debian/maas-region-controller-min.maas-regiond.service 1970-01-01 00:00:00 +0000 |
3450 | +++ debian/maas-region-controller-min.maas-regiond.service 2015-06-03 20:06:06 +0000 |
3451 | @@ -0,0 +1,24 @@ |
3452 | +[Unit] |
3453 | +Description=MAAS Region Controller |
3454 | +Documentation=https://maas.ubuntu.com/ |
3455 | + |
3456 | +[Service] |
3457 | +Type=oneshot |
3458 | +RemainAfterExit=yes |
3459 | +# systemd.service(5) clearly states that ExecStart can be specified zero |
3460 | +# times when Type=oneshot, but it does appears to be needed at present. |
3461 | +ExecStart=/bin/true |
3462 | + |
3463 | +# |
3464 | +# The maas-region-controller-min package configures four workers. This |
3465 | +# should work for most people. However: |
3466 | +# |
3467 | +# * `systemctl start maas-regiond-worker@x` (where 'x' can be anything, |
3468 | +# though integers >= 5 seem logical) will start an additional worker. |
3469 | +# |
3470 | +# * `systemctl enable maas-regiond-worker@x` will configure that worker |
3471 | +# so that it's persistent across reboots. |
3472 | +# |
3473 | + |
3474 | +[Install] |
3475 | +WantedBy=multi-user.target |
3476 | |
3477 | === added file 'debian/maas-region-controller-min.maas-regiond.upstart' |
3478 | --- debian/maas-region-controller-min.maas-regiond.upstart 1970-01-01 00:00:00 +0000 |
3479 | +++ debian/maas-region-controller-min.maas-regiond.upstart 2015-06-03 20:06:06 +0000 |
3480 | @@ -0,0 +1,17 @@ |
3481 | +description "MAAS Region Controller" |
3482 | +author "Gavin Panella <gavin.panella@canonical.com>" |
3483 | + |
3484 | +# This starts multiple instances of `maas-regiond-worker` and does |
3485 | +# nothing else itself; there is no main script so this runs "forever". |
3486 | +# By default, it launches four workers. |
3487 | + |
3488 | +start on filesystem and net-device-up |
3489 | +stop on runlevel [016] |
3490 | + |
3491 | +respawn |
3492 | + |
3493 | +pre-start script |
3494 | + for core in $(seq 4); do |
3495 | + start maas-regiond-worker core=${core} |
3496 | + done |
3497 | +end script |
3498 | |
3499 | === added file 'debian/maas-region-controller-min.maintscript' |
3500 | --- debian/maas-region-controller-min.maintscript 1970-01-01 00:00:00 +0000 |
3501 | +++ debian/maas-region-controller-min.maintscript 2015-06-03 20:06:06 +0000 |
3502 | @@ -0,0 +1,6 @@ |
3503 | +rm_conffile /etc/maas/txlongpoll.yaml 1.7.0~beta4+bzr3124-0ubuntu1 |
3504 | +rm_conffile /etc/init/maas-txlongpoll.conf 1.7.0~beta4+bzr3124-0ubuntu1 |
3505 | +rm_conffile /etc/init/maas-region-celery.conf 1.7.0~beta4+bzr3124-0ubuntu1 |
3506 | +rm_conffile /etc/maas/maas_local_celerconfig.py 1.7.0~beta4+bzr3124-0ubuntu1 |
3507 | +rm_conffile /usr/share/maas/maas_local_celerconfig.py 1.7.0~beta4+bzr3124-0ubuntu1 |
3508 | +rm_conffile /etc/maas/maas_local_celeryconfig.py 1.7.0~beta4+bzr3124-0ubuntu1 |
3509 | |
3510 | === added file 'debian/maas-region-controller-min.postinst' |
3511 | --- debian/maas-region-controller-min.postinst 1970-01-01 00:00:00 +0000 |
3512 | +++ debian/maas-region-controller-min.postinst 2015-06-03 20:06:06 +0000 |
3513 | @@ -0,0 +1,136 @@ |
3514 | +#!/bin/sh |
3515 | + |
3516 | +set -e |
3517 | + |
3518 | +. /usr/share/debconf/confmodule |
3519 | +db_version 2.0 |
3520 | + |
3521 | +RELEASE=`lsb_release -rs` || RELEASE="" |
3522 | + |
3523 | +configure_region_http() { |
3524 | + case $RELEASE in |
3525 | + 12.04|12.10|13.04) |
3526 | + # handle apache configs |
3527 | + if [ -e /etc/maas/maas-http.conf -a \ |
3528 | + ! -e /etc/apache2/conf.d/maas-http.conf ]; then |
3529 | + ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf |
3530 | + fi |
3531 | + ;; |
3532 | + *) |
3533 | + # handle apache configs |
3534 | + if [ -e /etc/maas/maas-http.conf -a \ |
3535 | + ! -e /etc/apache2/conf-enabled/maas-http.conf ]; then |
3536 | + ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf |
3537 | + fi |
3538 | + ;; |
3539 | + esac |
3540 | + # enable apache modules needed |
3541 | + a2enmod proxy_http |
3542 | + a2enmod expires |
3543 | + a2enmod rewrite |
3544 | +} |
3545 | + |
3546 | +configure_logging() { |
3547 | + # Give appropriate permissions |
3548 | + if [ ! -f /var/log/maas/regiond.log ]; then |
3549 | + touch /var/log/maas/regiond.log |
3550 | + fi |
3551 | + chown maas:maas /var/log/maas/regiond.log |
3552 | + |
3553 | + # Create log directory base |
3554 | + mkdir -p /var/log/maas/rsyslog |
3555 | + chown -R syslog:syslog /var/log/maas/rsyslog |
3556 | + # Make sure rsyslog reads our config |
3557 | + invoke-rc.d rsyslog restart |
3558 | + |
3559 | + # apache2 log symlinks |
3560 | + ln -sf /var/log/apache2 /var/log/maas/ |
3561 | +} |
3562 | + |
3563 | +configure_maas_default_url() { |
3564 | + local ipaddr="$1" |
3565 | + |
3566 | + if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then |
3567 | + sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/$ipaddr\/MAAS\"/" /etc/maas/maas_local_settings.py |
3568 | + fi |
3569 | +} |
3570 | + |
3571 | +get_default_route_ip() { |
3572 | + while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do |
3573 | + [ "$Mask" = "00000000" ] && break |
3574 | + done < /proc/net/route |
3575 | + interface="$Iface" |
3576 | + ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global) |
3577 | + ipaddr=${ipaddr#* inet } |
3578 | + ipaddr=${ipaddr%%/*} |
3579 | + echo $ipaddr |
3580 | +} |
3581 | + |
3582 | +if [ "$1" = "configure" ] && [ -z "$2" ]; then |
3583 | + ######################################################### |
3584 | + ################ Folder Permissions #################### |
3585 | + ######################################################### |
3586 | + mkdir -p /var/lib/maas/media/storage |
3587 | + chown -R maas:maas /var/lib/maas/ |
3588 | + |
3589 | + # Config will contain credentials, so should be readable |
3590 | + # by the application but nobody else. |
3591 | + chown root:maas /etc/maas/maas_local_settings.py |
3592 | + chmod 0640 /etc/maas/maas_local_settings.py |
3593 | + |
3594 | + ######################################################### |
3595 | + ################ Configure Apache2 #################### |
3596 | + ######################################################### |
3597 | + configure_region_http |
3598 | + |
3599 | + ######################################################### |
3600 | + ########## Configure DEFAULT_MAAS_URL ################# |
3601 | + ######################################################### |
3602 | + |
3603 | + # Obtain IP address of default route and change DEFAULT_MAAS_URL |
3604 | + # if default-maas-url has not been preseeded. |
3605 | + db_get maas/default-maas-url |
3606 | + ipaddr="$RET" |
3607 | + if [ -z "$RET" ]; then |
3608 | + ipaddr=$(get_default_route_ip) |
3609 | + fi |
3610 | + # Set the IP address of the interface with default route |
3611 | + if [ -n "$ipaddr" ]; then |
3612 | + configure_maas_default_url "$ipaddr" |
3613 | + db_set maas/default-maas-url "$ipaddr" |
3614 | + fi |
3615 | + |
3616 | + ######################################################### |
3617 | + ################ Configure Logging #################### |
3618 | + ######################################################### |
3619 | + configure_logging |
3620 | + |
3621 | +elif [ -n "$DEBCONF_RECONFIGURE" ]; then |
3622 | + # Set the IP address of the interface with default route |
3623 | + db_get maas/default-maas-url |
3624 | + ipaddr="$RET" |
3625 | + if [ -n "$ipaddr" ]; then |
3626 | + configure_maas_default_url "$ipaddr" |
3627 | + fi |
3628 | + |
3629 | +elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then |
3630 | + # Logging changed at r2611, ensure it is set up. |
3631 | + configure_logging |
3632 | + |
3633 | + # If upgrading to any later package version, then upgrade db. |
3634 | + invoke-rc.d apache2 stop || true |
3635 | + |
3636 | + # make sure maas http config is symlinked |
3637 | + configure_region_http |
3638 | + |
3639 | + # we need to regenerate the passwords and update configs. |
3640 | + db_get maas/default-maas-url |
3641 | + ipaddr="$RET" |
3642 | + configure_maas_default_url "$ipaddr" |
3643 | +fi |
3644 | + |
3645 | +invoke-rc.d apache2 restart || true |
3646 | + |
3647 | +db_stop |
3648 | + |
3649 | +#DEBHELPER# |
3650 | |
3651 | === added file 'debian/maas-region-controller-min.postrm' |
3652 | --- debian/maas-region-controller-min.postrm 1970-01-01 00:00:00 +0000 |
3653 | +++ debian/maas-region-controller-min.postrm 2015-06-03 20:06:06 +0000 |
3654 | @@ -0,0 +1,42 @@ |
3655 | +#!/bin/sh |
3656 | + |
3657 | +set -e |
3658 | + |
3659 | +. /usr/share/debconf/confmodule |
3660 | + |
3661 | +RELEASE=`lsb_release -rs` || RELEASE="" |
3662 | + |
3663 | +case "$1" in |
3664 | + purge) |
3665 | + rm -rf /var/log/maas |
3666 | + rm -rf /var/lib/maas |
3667 | + case $RELEASE in |
3668 | + 12.04|12.10|13.04) |
3669 | + if [ -h /etc/apache2/conf.d/maas-http.conf ]; then |
3670 | + rm -rf /etc/apache2/conf.d/maas-http.conf |
3671 | + fi |
3672 | + ;; |
3673 | + *) |
3674 | + if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then |
3675 | + rm -rf /etc/apache2/conf-enabled/maas-http.conf |
3676 | + fi |
3677 | + ;; |
3678 | + esac |
3679 | + |
3680 | + # Restarting apache2 |
3681 | + if [ -x /usr/sbin/invoke-rc.d ]; then |
3682 | + invoke-rc.d apache2 restart || true |
3683 | + fi |
3684 | + |
3685 | + # Delete symlink |
3686 | + if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then |
3687 | + rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas |
3688 | + fi |
3689 | + |
3690 | + # Delete any remaining / leftover file |
3691 | + rm -rf /usr/share/maas/maas/ |
3692 | +esac |
3693 | + |
3694 | +#DEBHELPER# |
3695 | + |
3696 | +db_stop |
3697 | |
3698 | === added file 'debian/maas-region-controller-min.preinst' |
3699 | --- debian/maas-region-controller-min.preinst 1970-01-01 00:00:00 +0000 |
3700 | +++ debian/maas-region-controller-min.preinst 2015-06-03 20:06:06 +0000 |
3701 | @@ -0,0 +1,35 @@ |
3702 | +#!/bin/sh |
3703 | + |
3704 | +set -e |
3705 | + |
3706 | +. /usr/share/debconf/confmodule |
3707 | + |
3708 | +if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.7.0~beta4+bzr3127-0ubuntu1; then |
3709 | + |
3710 | + if [ -f /etc/init/maas-txlongpoll.conf ]; then |
3711 | + invoke-rc.d maas-txlongpoll stop |
3712 | + fi |
3713 | + |
3714 | + if [ -f /var/log/maas/txlongpoll.log ]; then |
3715 | + rm -rf /var/log/maas/txlongpoll.log |
3716 | + fi |
3717 | + |
3718 | + if [ -f /etc/init/maas-region-celery.conf ]; then |
3719 | + invoke-rc.d maas-region-celery stop |
3720 | + fi |
3721 | + |
3722 | + if [ -f /var/log/maas/celery-region.log ]; then |
3723 | + rm -rf /var/log/maas/celery-region.log |
3724 | + fi |
3725 | + |
3726 | +fi |
3727 | + |
3728 | + |
3729 | +if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3463-0ubuntu1; then |
3730 | + |
3731 | + if [ -f /var/log/maas/maas-django.log ]; then |
3732 | + rm -rf /var/log/maas/maas-django.log |
3733 | + fi |
3734 | + |
3735 | +fi |
3736 | +#DEBHELPER# |
3737 | |
3738 | === added file 'debian/maas-region-controller-min.prerm' |
3739 | --- debian/maas-region-controller-min.prerm 1970-01-01 00:00:00 +0000 |
3740 | +++ debian/maas-region-controller-min.prerm 2015-06-03 20:06:06 +0000 |
3741 | @@ -0,0 +1,9 @@ |
3742 | +#!/bin/sh |
3743 | + |
3744 | +set -e |
3745 | + |
3746 | +. /usr/share/debconf/confmodule |
3747 | + |
3748 | +#DEBHELPER# |
3749 | + |
3750 | +invoke-rc.d apache2 stop || true |
3751 | |
3752 | === added file 'debian/maas-region-controller-min.templates' |
3753 | --- debian/maas-region-controller-min.templates 1970-01-01 00:00:00 +0000 |
3754 | +++ debian/maas-region-controller-min.templates 2015-06-03 20:06:06 +0000 |
3755 | @@ -0,0 +1,22 @@ |
3756 | +Template: maas/installation-note |
3757 | +Type: note |
3758 | +Default: false |
3759 | +_Description: Ubuntu MAAS Server |
3760 | + The Ubuntu MAAS Server has been installed in your system. You |
3761 | + can access the MAAS Web interface here: |
3762 | + . |
3763 | + http://${MAAS_URL}/MAAS |
3764 | + . |
3765 | + If the automatically detected address above is not in the same |
3766 | + network as the MAAS clients, you need to reconfigure it: |
3767 | + . |
3768 | + sudo dpkg-reconfigure maas-region-controller |
3769 | + |
3770 | +Template: maas/default-maas-url |
3771 | +Type: string |
3772 | +_Description: Ubuntu MAAS PXE/Provisioning network address: |
3773 | + The Ubuntu MAAS Server automatically detects the IP address |
3774 | + that is used for PXE and provisioning. However, it needs to be |
3775 | + in the same network as the clients. If the automatically |
3776 | + detected address is not in the same network as the clients, it |
3777 | + must be changed. |
3778 | |
3779 | === added file 'debian/maas-region-controller.config' |
3780 | --- debian/maas-region-controller.config 1970-01-01 00:00:00 +0000 |
3781 | +++ debian/maas-region-controller.config 2015-06-03 20:06:06 +0000 |
3782 | @@ -0,0 +1,45 @@ |
3783 | +#!/bin/sh |
3784 | + |
3785 | +set -e |
3786 | + |
3787 | +. /usr/share/debconf/confmodule |
3788 | +db_version 2.0 |
3789 | + |
3790 | +# creates question |
3791 | +set_question() { |
3792 | + if ! db_fget "$1" seen; then |
3793 | + db_register dbconfig-common/dbconfig-install "$1" |
3794 | + db_subst "$1" ID "$1" |
3795 | + db_fget "$1" seen |
3796 | + fi |
3797 | + if [ "$RET" = false ]; then |
3798 | + db_set "$1" "$2" |
3799 | + db_fset "$1" seen true |
3800 | + fi |
3801 | +} |
3802 | + |
3803 | +# source dbconfig-common shell library, and call the hook function |
3804 | +if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then |
3805 | + . /usr/share/dbconfig-common/dpkg/config.pgsql |
3806 | +fi |
3807 | + |
3808 | +if [ "$1" = "configure" ] && [ -z "$2" ]; then |
3809 | + # Hide maas/dbconfig-install question by setting default. |
3810 | + set_question maas-region-controller/dbconfig-install true |
3811 | + set_question maas-region-controller/pgsql/app-pass "" |
3812 | + |
3813 | + dbc_dbname="maasdb" |
3814 | + dbc_dbuser="maas" |
3815 | + dbc_remove="true" |
3816 | + |
3817 | + dbc_go maas-region-controller $@ |
3818 | + |
3819 | +elif [ -n "$DEBCONF_RECONFIGURE" ]; then |
3820 | + db_get maas/default-maas-url || true |
3821 | + if [ -z "$RET" ]; then |
3822 | + ipaddr=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"/")} END{print array[3] }' /etc/maas/maas_local_settings.py) |
3823 | + db_set maas/default-maas-url "$ipaddr" |
3824 | + fi |
3825 | + db_input low maas/default-maas-url || true |
3826 | + db_go |
3827 | +fi |
3828 | |
3829 | === added file 'debian/maas-region-controller.postinst' |
3830 | --- debian/maas-region-controller.postinst 1970-01-01 00:00:00 +0000 |
3831 | +++ debian/maas-region-controller.postinst 2015-06-03 20:06:06 +0000 |
3832 | @@ -0,0 +1,151 @@ |
3833 | +#!/bin/sh |
3834 | + |
3835 | +set -e |
3836 | + |
3837 | +. /usr/share/debconf/confmodule |
3838 | +db_version 2.0 |
3839 | + |
3840 | +if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then |
3841 | + . /usr/share/dbconfig-common/dpkg/postinst.pgsql |
3842 | +fi |
3843 | + |
3844 | +RELEASE=`lsb_release -rs` || RELEASE="" |
3845 | + |
3846 | +maas_sync_migrate_db(){ |
3847 | + maas-region-admin syncdb --noinput |
3848 | + maas-region-admin migrate maasserver --noinput |
3849 | + maas-region-admin migrate metadataserver --noinput |
3850 | + |
3851 | + # This command makes some assumptions about how postgresql works, |
3852 | + # so don't assume the package is broken if it fails. |
3853 | + maas-region-admin purge_unused_images || true |
3854 | +} |
3855 | + |
3856 | +restart_postgresql(){ |
3857 | + invoke-rc.d --force postgresql restart || true |
3858 | +} |
3859 | + |
3860 | +configure_maas_database() { |
3861 | + local dbc_dbpass="$1" |
3862 | + if grep -qs "^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$" /etc/maas/maas_local_settings.py; then |
3863 | + sed -i "s/^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$/ 'PASSWORD': '"$dbc_dbpass"',/" \ |
3864 | + /etc/maas/maas_local_settings.py |
3865 | + fi |
3866 | +} |
3867 | + |
3868 | +configure_maas_default_url() { |
3869 | + local ipaddr="$1" |
3870 | + |
3871 | + if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then |
3872 | + sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/"$ipaddr"\/MAAS\"/" \ |
3873 | + /etc/maas/maas_local_settings.py |
3874 | + fi |
3875 | +} |
3876 | + |
3877 | +get_default_route_ip() { |
3878 | + while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do |
3879 | + [ "$Mask" = "00000000" ] && break |
3880 | + done < /proc/net/route |
3881 | + interface="$Iface" |
3882 | + ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global) |
3883 | + ipaddr=${ipaddr#* inet } |
3884 | + ipaddr=${ipaddr%%/*} |
3885 | + echo $ipaddr |
3886 | +} |
3887 | + |
3888 | + |
3889 | +if [ "$1" = "configure" ] && [ -z "$2" ]; then |
3890 | + ######################################################### |
3891 | + ################ Folder Permissions #################### |
3892 | + ######################################################### |
3893 | + mkdir -p /var/lib/maas/media/storage |
3894 | + chown -R maas:maas /var/lib/maas/ |
3895 | + |
3896 | + # Config will contain credentials, so should be readable |
3897 | + # by the application but nobody else. |
3898 | + chown root:maas /etc/maas/maas_local_settings.py |
3899 | + chmod 0640 /etc/maas/maas_local_settings.py |
3900 | + |
3901 | + ######################################################### |
3902 | + ########## Configure DEFAULT_MAAS_URL ################# |
3903 | + ######################################################### |
3904 | + |
3905 | + # Obtain IP address of default route and change DEFAULT_MAAS_URL |
3906 | + # if default-maas-url has not been preseeded. |
3907 | + db_get maas/default-maas-url |
3908 | + ipaddr="$RET" |
3909 | + if [ -z "$RET" ]; then |
3910 | + ipaddr=$(get_default_route_ip) |
3911 | + fi |
3912 | + # Set the IP address of the interface with default route |
3913 | + if [ -n "$ipaddr" ]; then |
3914 | + configure_maas_default_url "$ipaddr" |
3915 | + db_subst maas/installation-note MAAS_URL "$ipaddr" |
3916 | + db_set maas/default-maas-url "$ipaddr" |
3917 | + fi |
3918 | + |
3919 | + ######################################################### |
3920 | + ################ Configure Database ################### |
3921 | + ######################################################### |
3922 | + |
3923 | + # Need to for postgresql start so it doesn't fail on the installer |
3924 | + restart_postgresql |
3925 | + |
3926 | + # Create the database |
3927 | + dbc_go maas-region-controller $@ |
3928 | + configure_maas_database "$dbc_dbpass" |
3929 | + |
3930 | + # Only syncdb if we have selected to install it with dbconfig-common. |
3931 | + db_get maas-region-controller/dbconfig-install |
3932 | + if [ "$RET" = "true" ]; then |
3933 | + maas_sync_migrate_db |
3934 | + fi |
3935 | + |
3936 | + # Display installation note |
3937 | + db_input low maas/installation-note || true |
3938 | + db_go |
3939 | + |
3940 | +elif [ -n "$DEBCONF_RECONFIGURE" ]; then |
3941 | + # Set the IP address of the interface with default route |
3942 | + db_get maas/default-maas-url |
3943 | + ipaddr="$RET" |
3944 | + if [ -n "$ipaddr" ]; then |
3945 | + configure_maas_default_url "$ipaddr" |
3946 | + fi |
3947 | + |
3948 | +elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then |
3949 | + # If upgrading to any later package version, then upgrade db. |
3950 | + invoke-rc.d apache2 stop || true |
3951 | + |
3952 | + # make sure postgresql is running |
3953 | + restart_postgresql |
3954 | + |
3955 | + # we need to regenerate the passwords and update configs. |
3956 | + db_get maas/default-maas-url |
3957 | + ipaddr="$RET" |
3958 | + configure_maas_default_url "$ipaddr" |
3959 | + # handle database upgrade |
3960 | + if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then |
3961 | + # source dbconfig-common db config for maas-region-controller |
3962 | + # before upgrading database, otherwise a new config is written |
3963 | + # but the password is no longer preserved. |
3964 | + . /etc/dbconfig-common/maas-region-controller.conf |
3965 | + else |
3966 | + dbc_go maas-region-controller $@ |
3967 | + fi |
3968 | + configure_maas_database "$dbc_dbpass" |
3969 | + |
3970 | + maas_sync_migrate_db |
3971 | + |
3972 | +fi |
3973 | + |
3974 | +invoke-rc.d maas-regiond restart || true |
3975 | +invoke-rc.d apache2 restart || true |
3976 | + |
3977 | +if [ -f /etc/init/maas-clusterd.conf ]; then |
3978 | + invoke-rc.d maas-clusterd restart || true |
3979 | +fi |
3980 | + |
3981 | +db_stop |
3982 | + |
3983 | +#DEBHELPER# |
3984 | |
3985 | === added file 'debian/maas-region-controller.postrm' |
3986 | --- debian/maas-region-controller.postrm 1970-01-01 00:00:00 +0000 |
3987 | +++ debian/maas-region-controller.postrm 2015-06-03 20:06:06 +0000 |
3988 | @@ -0,0 +1,47 @@ |
3989 | +#!/bin/sh |
3990 | + |
3991 | +set -e |
3992 | + |
3993 | +. /usr/share/debconf/confmodule |
3994 | + |
3995 | +RELEASE=`lsb_release -rs` || RELEASE="" |
3996 | + |
3997 | +if [ -f /etc/dbconfig-common/maas.conf ]; then |
3998 | + if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then |
3999 | + . /usr/share/dbconfig-common/dpkg/postrm.pgsql |
4000 | + dbc_go maas-region-controller $@ |
4001 | + fi |
4002 | +fi |
4003 | + |
4004 | +case "$1" in |
4005 | + purge) |
4006 | + rm -rf /var/log/maas |
4007 | + rm -rf /var/lib/maas |
4008 | + case $RELEASE in |
4009 | + 12.04|12.10|13.04) |
4010 | + if [ -h /etc/apache2/conf.d/maas-http.conf ]; then |
4011 | + rm -rf /etc/apache2/conf.d/maas-http.conf |
4012 | + fi |
4013 | + ;; |
4014 | + *) |
4015 | + if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then |
4016 | + rm -rf /etc/apache2/conf-enabled/maas-http.conf |
4017 | + fi |
4018 | + ;; |
4019 | + esac |
4020 | + |
4021 | + # Restarting apache2 |
4022 | + if [ -x /usr/sbin/invoke-rc.d ]; then |
4023 | + invoke-rc.d apache2 restart || true |
4024 | + fi |
4025 | + |
4026 | + # Delete symlink |
4027 | + if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then |
4028 | + rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas |
4029 | + fi |
4030 | + |
4031 | +esac |
4032 | + |
4033 | +#DEBHELPER# |
4034 | + |
4035 | +db_stop |
4036 | |
4037 | === added file 'debian/maas-region-controller.prerm' |
4038 | --- debian/maas-region-controller.prerm 1970-01-01 00:00:00 +0000 |
4039 | +++ debian/maas-region-controller.prerm 2015-06-03 20:06:06 +0000 |
4040 | @@ -0,0 +1,13 @@ |
4041 | +#!/bin/sh |
4042 | + |
4043 | +set -e |
4044 | + |
4045 | +. /usr/share/debconf/confmodule |
4046 | + |
4047 | +#DEBHELPER# |
4048 | + |
4049 | +invoke-rc.d apache2 stop || true |
4050 | +invoke-rc.d maas-regiond stop || true |
4051 | + |
4052 | +. /usr/share/dbconfig-common/dpkg/prerm.pgsql |
4053 | +dbc_go maas-region-controller $@ |
4054 | |
4055 | === added file 'debian/maintscript' |
4056 | --- debian/maintscript 1970-01-01 00:00:00 +0000 |
4057 | +++ debian/maintscript 2015-06-03 20:06:06 +0000 |
4058 | @@ -0,0 +1,2 @@ |
4059 | +rm_conffile /etc/init/maas-celery.conf 0.1+bzr971+dfsg-0ubuntu2 |
4060 | +rm_conffile /etc/dbconfig-common/maas.conf 0.1+bzr971+dfsg-0ubuntu2 |
4061 | |
4062 | === added directory 'debian/patches' |
4063 | === added file 'debian/patches/01-fix-database-settings.patch' |
4064 | --- debian/patches/01-fix-database-settings.patch 1970-01-01 00:00:00 +0000 |
4065 | +++ debian/patches/01-fix-database-settings.patch 2015-06-03 20:06:06 +0000 |
4066 | @@ -0,0 +1,17 @@ |
4067 | +Index: maas-1.8.0~alpha1+bzr3486.orig/contrib/maas_local_settings.py |
4068 | +=================================================================== |
4069 | +--- maas-1.8.0~alpha1+bzr3486.orig.orig/contrib/maas_local_settings.py 2015-01-23 09:50:03.185579822 -0500 |
4070 | ++++ maas-1.8.0~alpha1+bzr3486.orig/contrib/maas_local_settings.py 2015-01-23 09:50:03.181579822 -0500 |
4071 | +@@ -14,9 +14,9 @@ |
4072 | + 'default': { |
4073 | + # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc. |
4074 | + 'ENGINE': 'django.db.backends.postgresql_psycopg2', |
4075 | +- 'NAME': '', |
4076 | +- 'USER': '', |
4077 | +- 'PASSWORD': '', |
4078 | ++ 'NAME': 'maasdb', |
4079 | ++ 'USER': 'maas', |
4080 | ++ 'PASSWORD': 'maas', |
4081 | + 'HOST': 'localhost', |
4082 | + } |
4083 | + } |
4084 | |
4085 | === added file 'debian/patches/02-pserv-config.patch' |
4086 | --- debian/patches/02-pserv-config.patch 1970-01-01 00:00:00 +0000 |
4087 | +++ debian/patches/02-pserv-config.patch 2015-06-03 20:06:06 +0000 |
4088 | @@ -0,0 +1,18 @@ |
4089 | +Description: Use default settings for MAAS PSERV |
4090 | + Use default settings for MAAS pserv. These default settings |
4091 | + include port, logfile, oops directory, cobbler url and username |
4092 | +Author: Andres Rodriguez <andreserl@ubuntu.com> |
4093 | + |
4094 | +=== modified file 'etc/maas/pserv.yaml' |
4095 | +Index: maas-1.8.0~beta5+bzr3849.orig/etc/maas/pserv.yaml |
4096 | +=================================================================== |
4097 | +--- maas-1.8.0~beta5+bzr3849.orig.orig/etc/maas/pserv.yaml 2015-04-29 02:40:55.703960406 -0400 |
4098 | ++++ maas-1.8.0~beta5+bzr3849.orig/etc/maas/pserv.yaml 2015-04-29 02:41:10.567959953 -0400 |
4099 | +@@ -18,7 +18,6 @@ |
4100 | + # resource_root: /var/lib/maas/boot-resources/current/ |
4101 | + |
4102 | + # port: 69 |
4103 | +- port: 5244 |
4104 | + ## The URL to be contacted to generate PXE configurations. |
4105 | + # generator: http://localhost/MAAS/api/1.0/pxeconfig/ |
4106 | + generator: http://localhost:5240/MAAS/api/1.0/pxeconfig/ |
4107 | |
4108 | === added file 'debian/patches/series' |
4109 | --- debian/patches/series 1970-01-01 00:00:00 +0000 |
4110 | +++ debian/patches/series 2015-06-03 20:06:06 +0000 |
4111 | @@ -0,0 +1,2 @@ |
4112 | +01-fix-database-settings.patch |
4113 | +02-pserv-config.patch |
4114 | |
4115 | === added directory 'debian/po' |
4116 | === added file 'debian/po/POTFILES.in' |
4117 | --- debian/po/POTFILES.in 1970-01-01 00:00:00 +0000 |
4118 | +++ debian/po/POTFILES.in 2015-06-03 20:06:06 +0000 |
4119 | @@ -0,0 +1,2 @@ |
4120 | +[type: gettext/rfc822deb] maas-region-controller.templates |
4121 | +[type: gettext/rfc822deb] maas-cluster-controller.templates |
4122 | |
4123 | === added file 'debian/po/templates.pot' |
4124 | --- debian/po/templates.pot 1970-01-01 00:00:00 +0000 |
4125 | +++ debian/po/templates.pot 2015-06-03 20:06:06 +0000 |
4126 | @@ -0,0 +1,82 @@ |
4127 | +# SOME DESCRIPTIVE TITLE. |
4128 | +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
4129 | +# This file is distributed under the same license as the PACKAGE package. |
4130 | +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
4131 | +# |
4132 | +#, fuzzy |
4133 | +msgid "" |
4134 | +msgstr "" |
4135 | +"Project-Id-Version: maas\n" |
4136 | +"Report-Msgid-Bugs-To: maas@packages.debian.org\n" |
4137 | +"POT-Creation-Date: 2012-10-04 13:40-0400\n" |
4138 | +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
4139 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
4140 | +"Language-Team: LANGUAGE <LL@li.org>\n" |
4141 | +"Language: \n" |
4142 | +"MIME-Version: 1.0\n" |
4143 | +"Content-Type: text/plain; charset=CHARSET\n" |
4144 | +"Content-Transfer-Encoding: 8bit\n" |
4145 | + |
4146 | +#. Type: note |
4147 | +#. Description |
4148 | +#: ../maas-region-controller.templates:1001 |
4149 | +msgid "Ubuntu MAAS Server" |
4150 | +msgstr "" |
4151 | + |
4152 | +#. Type: note |
4153 | +#. Description |
4154 | +#: ../maas-region-controller.templates:1001 |
4155 | +msgid "" |
4156 | +"The Ubuntu MAAS Server has been installed in your system. You can access the " |
4157 | +"MAAS Web interface here:" |
4158 | +msgstr "" |
4159 | + |
4160 | +#. Type: note |
4161 | +#. Description |
4162 | +#: ../maas-region-controller.templates:1001 |
4163 | +msgid " http://${MAAS_URL}/MAAS" |
4164 | +msgstr "" |
4165 | + |
4166 | +#. Type: note |
4167 | +#. Description |
4168 | +#: ../maas-region-controller.templates:1001 |
4169 | +msgid "" |
4170 | +"If the automatically detected address above is not in the same network as " |
4171 | +"the MAAS clients, you need to reconfigure it:" |
4172 | +msgstr "" |
4173 | + |
4174 | +#. Type: note |
4175 | +#. Description |
4176 | +#: ../maas-region-controller.templates:1001 |
4177 | +msgid " sudo dpkg-reconfigure maas-region-controller" |
4178 | +msgstr "" |
4179 | + |
4180 | +#. Type: string |
4181 | +#. Description |
4182 | +#: ../maas-region-controller.templates:2001 |
4183 | +msgid "Ubuntu MAAS PXE/Provisioning network address:" |
4184 | +msgstr "" |
4185 | + |
4186 | +#. Type: string |
4187 | +#. Description |
4188 | +#: ../maas-region-controller.templates:2001 |
4189 | +msgid "" |
4190 | +"The Ubuntu MAAS Server automatically detects the IP address that is used for " |
4191 | +"PXE and provisioning. However, it needs to be in the same network as the " |
4192 | +"clients. If the automatically detected address is not in the same network as " |
4193 | +"the clients, it must be changed." |
4194 | +msgstr "" |
4195 | + |
4196 | +#. Type: string |
4197 | +#. Description |
4198 | +#: ../maas-cluster-controller.templates:1001 |
4199 | +msgid "Ubuntu MAAS API address:" |
4200 | +msgstr "" |
4201 | + |
4202 | +#. Type: string |
4203 | +#. Description |
4204 | +#: ../maas-cluster-controller.templates:1001 |
4205 | +msgid "" |
4206 | +"The MAAS Cluster Controller needs to contact the MAAS server to register its " |
4207 | +"presence. Set the URL to the MAAS API here, e.g. http://192.168.1.1/MAAS" |
4208 | +msgstr "" |
4209 | |
4210 | === added file 'debian/python-django-maas.install' |
4211 | --- debian/python-django-maas.install 1970-01-01 00:00:00 +0000 |
4212 | +++ debian/python-django-maas.install 2015-06-03 20:06:06 +0000 |
4213 | @@ -0,0 +1,2 @@ |
4214 | +debian/tmp/usr/lib/python*/dist-packages/maasserver |
4215 | +debian/tmp/usr/lib/python*/dist-packages/metadataserver |
4216 | |
4217 | === added file 'debian/python-maas-client.install' |
4218 | --- debian/python-maas-client.install 1970-01-01 00:00:00 +0000 |
4219 | +++ debian/python-maas-client.install 2015-06-03 20:06:06 +0000 |
4220 | @@ -0,0 +1,1 @@ |
4221 | +debian/tmp/usr/lib/python*/dist-packages/apiclient |
4222 | |
4223 | === added file 'debian/python-maas-provisioningserver.install' |
4224 | --- debian/python-maas-provisioningserver.install 1970-01-01 00:00:00 +0000 |
4225 | +++ debian/python-maas-provisioningserver.install 2015-06-03 20:06:06 +0000 |
4226 | @@ -0,0 +1,5 @@ |
4227 | +debian/tmp/usr/lib/python*/dist-packages/provisioningserver |
4228 | + |
4229 | +# Install other stuff |
4230 | +debian/extras/maas-provision usr/sbin |
4231 | +debian/extras/maas-probe-dhcp usr/sbin |
4232 | |
4233 | === added file 'debian/python-maas-provisioningserver.lintian-overrides' |
4234 | --- debian/python-maas-provisioningserver.lintian-overrides 1970-01-01 00:00:00 +0000 |
4235 | +++ debian/python-maas-provisioningserver.lintian-overrides 2015-06-03 20:06:06 +0000 |
4236 | @@ -0,0 +1,2 @@ |
4237 | +python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-provision |
4238 | +python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-probe-dhcp |
4239 | |
4240 | === added file 'debian/rules' |
4241 | --- debian/rules 1970-01-01 00:00:00 +0000 |
4242 | +++ debian/rules 2015-06-03 20:06:06 +0000 |
4243 | @@ -0,0 +1,77 @@ |
4244 | +#!/usr/bin/make -f |
4245 | + |
4246 | +BUILDHOME = $(CURDIR)/debian/build |
4247 | +PYTHON = $(shell pyversions -d) |
4248 | +# Python enum modules. |
4249 | +py_enums := $(wildcard src/*/enum.py) |
4250 | + |
4251 | +%: |
4252 | + dh $@ --with python2,apport,systemd --buildsystem=python_distutils |
4253 | + |
4254 | +override_dh_installinit: |
4255 | + # maas-clusterd |
4256 | + dh_systemd_enable --name maas-clusterd |
4257 | + dh_installinit --name maas-clusterd |
4258 | + dh_systemd_start --name maas-clusterd |
4259 | + # maas-regiond |
4260 | + dh_systemd_enable --name maas-regiond |
4261 | + dh_installinit --name maas-regiond |
4262 | + dh_systemd_start --name maas-regiond |
4263 | + # maas-regiond-worker |
4264 | + dh_installinit --no-start --name maas-regiond-worker # Upstart |
4265 | + dh_installinit --no-start --name maas-regiond-worker@ # systemd |
4266 | + # maas-dhcpd |
4267 | + dh_systemd_enable --name maas-dhcpd |
4268 | + dh_installinit --name maas-dhcpd |
4269 | + dh_systemd_start --name maas-dhcpd |
4270 | + # maas-dhcpd6 |
4271 | + dh_systemd_enable --name maas-dhcpd6 |
4272 | + dh_installinit --name maas-dhcpd6 |
4273 | + dh_systemd_start --name maas-dhcpd6 |
4274 | + # maas-proxy |
4275 | + dh_systemd_enable --name maas-proxy |
4276 | + dh_installinit --name maas-proxy |
4277 | + dh_systemd_start --name maas-proxy |
4278 | + |
4279 | +override_dh_auto_build: |
4280 | + dh_auto_build |
4281 | + |
4282 | + mkdir -p $(BUILDHOME) |
4283 | + HOME=$(BUILDHOME) PYTHONPATH=$(CURDIR)/src/ $(PYTHON) \ |
4284 | + $(CURDIR)/src/maasserver/utils/jsenums.py \ |
4285 | + $(py_enums) > $(BUILDHOME)/enums.js |
4286 | + |
4287 | +override_dh_auto_install: |
4288 | + dh_auto_install |
4289 | + |
4290 | + # Move static files |
4291 | + install -d -m 755 $(CURDIR)/debian/tmp/usr/share/maas/web/static |
4292 | + mv $(CURDIR)/debian/tmp/usr/lib/python*/*-packages/maasserver/static \ |
4293 | + $(CURDIR)/debian/tmp/usr/share/maas/web/ |
4294 | + |
4295 | + # Remove scss directory from static files |
4296 | + rm -rf $(CURDIR)/debian/tmp/usr/share/maas/web/scss |
4297 | + |
4298 | + # Install built enums.js file. |
4299 | + cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/ |
4300 | + |
4301 | + # install the apparmor profile |
4302 | + install -d -m 755 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d |
4303 | + install -m 644 $(CURDIR)/debian/maas-dhcp.apparmor \ |
4304 | + $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d/maas |
4305 | + |
4306 | + dh_install --list-missing |
4307 | + |
4308 | +override_dh_auto_clean: |
4309 | + dh_auto_clean |
4310 | + rm -rf $(BUILDHOME) |
4311 | + rm -rf src/*.egg-info |
4312 | + |
4313 | +DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST))) |
4314 | +REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \ |
4315 | + | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p') |
4316 | +VER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \ |
4317 | + | sed -rne 's,^Version: ([^-]+).*,\1,p') |
4318 | +get-orig-source: |
4319 | + bzr export -r $(REV) --root=maas-$(VER).orig \ |
4320 | + maas_$(VER).orig.tar.gz lp:maas |
4321 | |
4322 | === added directory 'debian/source' |
4323 | === added file 'debian/source/format' |
4324 | --- debian/source/format 1970-01-01 00:00:00 +0000 |
4325 | +++ debian/source/format 2015-06-03 20:06:06 +0000 |
4326 | @@ -0,0 +1,1 @@ |
4327 | +3.0 (quilt) |
4328 | |
4329 | === added file 'debian/watch' |
4330 | --- debian/watch 1970-01-01 00:00:00 +0000 |
4331 | +++ debian/watch 2015-06-03 20:06:06 +0000 |
4332 | @@ -0,0 +1,3 @@ |
4333 | +version=3 |
4334 | +opts=dversionmangle=s/\.dfsg// \ |
4335 | +http://launchpad.net/maas/+download https://launchpad.net/maas/.*/maas-(.*).tar.* |