Merge lp:~allenap/maas/packaging.trusty.authbind-ipv6 into lp:maas/1.5

Proposed by Gavin Panella on 2014-07-15
Status: Superseded
Proposed branch: lp:~allenap/maas/packaging.trusty.authbind-ipv6
Merge into: lp:maas/1.5
Diff against target: 3526 lines (+3177/-0)
69 files modified
debian/changelog (+1165/-0)
debian/compat (+1/-0)
debian/control (+232/-0)
debian/copyright (+25/-0)
debian/extras/20-maas.conf (+32/-0)
debian/extras/99-maas (+5/-0)
debian/extras/99-maas-sudoers (+4/-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-region-admin (+8/-0)
debian/extras/maas-region-celeryd (+50/-0)
debian/extras/maas_remote_syslog_compress (+2/-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 (+31/-0)
debian/maas-cluster-controller.links (+1/-0)
debian/maas-cluster-controller.lintian-overrides (+1/-0)
debian/maas-cluster-controller.logrotate (+9/-0)
debian/maas-cluster-controller.maas-cluster-celery.upstart (+30/-0)
debian/maas-cluster-controller.maas-pserv.upstart (+32/-0)
debian/maas-cluster-controller.postinst (+166/-0)
debian/maas-cluster-controller.postrm (+43/-0)
debian/maas-cluster-controller.templates (+7/-0)
debian/maas-common.install (+2/-0)
debian/maas-common.postinst (+14/-0)
debian/maas-common.postrm (+14/-0)
debian/maas-dhcp.apparmor (+7/-0)
debian/maas-dhcp.install (+1/-0)
debian/maas-dhcp.maas-dhcp-server.upstart (+65/-0)
debian/maas-dhcp.postinst (+15/-0)
debian/maas-dhcp.postrm (+13/-0)
debian/maas-dns.dirs (+1/-0)
debian/maas-dns.postinst (+46/-0)
debian/maas-dns.postrm (+23/-0)
debian/maas-region-controller-min.apport (+37/-0)
debian/maas-region-controller-min.dirs (+1/-0)
debian/maas-region-controller-min.install (+40/-0)
debian/maas-region-controller-min.links (+2/-0)
debian/maas-region-controller-min.lintian-overrides (+6/-0)
debian/maas-region-controller-min.logrotate (+18/-0)
debian/maas-region-controller-min.maas-region-celery.upstart (+27/-0)
debian/maas-region-controller-min.maas-txlongpoll.upstart (+27/-0)
debian/maas-region-controller-min.postinst (+170/-0)
debian/maas-region-controller-min.postrm (+39/-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 (+301/-0)
debian/maas-region-controller.postrm (+59/-0)
debian/maas-region-controller.prerm (+12/-0)
debian/maintscript (+2/-0)
debian/patches/01-fix-database-settings.patch (+24/-0)
debian/patches/02-pserv-config.patch (+34/-0)
debian/patches/03-txlongpoll-config.patch (+37/-0)
debian/patches/series (+3/-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 (+56/-0)
debian/source/format (+1/-0)
debian/watch (+3/-0)
To merge this branch: bzr merge lp:~allenap/maas/packaging.trusty.authbind-ipv6
Reviewer Review Type Date Requested Status
MAAS Maintainers 2014-07-15 Pending
Review via email: mp+226930@code.launchpad.net

Commit message

Configure authbind to permit binding all IPv6 addresses on ports 68 and 69 too.

Description of the change

Backport of r285 from packaging trunk.

To post a comment you must log in.

Unmerged revisions

285. By Gavin Panella on 2014-07-15

Configure authbind to permit binding all IPv6 addresses on ports 68 and 69 too.

284. By Greg Lutostanski on 2014-06-20

[r=andreserl][bug=1332532][author=lutostag] move python-seamicroclient dep from maas-cluster-controller to python-maas-provisioningserver

283. By Greg Lutostanski on 2014-06-20

[r=blake-rouse,andreser][bug=1328231][author=lutostag] Fix bug 1328231 by adding grub-common as a dependency for maas-cluster-controller on trusty

282. By Julian Edwards on 2014-06-04

Release 1.5.3; open 1.5.4

281. By Raphaël Badin on 2014-06-03

Backport revision 278: Add sudoer rule 'maas-dhcp-server stop' job.

280. By Julian Edwards on 2014-05-26

open 1.5.3

279. By Julian Edwards on 2014-05-26

1.5.2 release

278. By Raphaël Badin on 2014-05-23

Add dependency on python-pexpect.

277. By Raphaël Badin on 2014-05-23

Bump upstream revision.

276. By Andres Rodriguez on 2014-04-15

Fix packaging

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1165 @@
1maas (1.5.4+bzr2287-0ubuntu1) UNRELEASED; urgency=medium
2
3 * UNRELEASED
4
5 [ Greg Lutostanski ]
6 * debian/control:
7 - maas-cluster-controller depends on grub-common
8 - maas-provisioningserver not maas-cluster-controller depends on
9 python-seamicroclient (LP: #1332532)
10
11 + [ Gavin Panella ]
12 * debian/maas-cluster-controller.postinst
13 - Allow maas-pserv to bind to all IPv6 addresses too.
14
15 -- Julian Edwards <julian.edwards@canonical.com> Wed, 04 Jun 2014 13:32:00 +1000
16
17maas (1.5.3+bzr2287-0ubuntu1) trusty; urgency=medium
18
19 * New upstream bugfix release:
20 - Reduce number of celery tasks emitted when updating a cluster controller
21 (LP: #1324944)
22 - Fix VirshSSH template which was referencing invalid attributes
23 (LP: #1324966)
24 - Fix a start up problem where a database lock was being taken outside of
25 a transaction (LP: #1325759)
26 - Reformat badly formatted Architecture error message (LP: #1301465)
27 - Final changes to support ppc64el (now known as PowerNV) (LP: #1315154)
28
29 [ Raphaël Badin ]
30 * debian/extras/99-maas-sudoers:
31 - Add rule 'maas-dhcp-server stop' job.
32
33 -- Julian Edwards <julian.edwards@canonical.com> Wed, 04 Jun 2014 13:31:46 +1000
34
35maas (1.5.2+bzr2277-0ubuntu1) trusty; urgency=medium
36
37 * New upstream bugfix release:
38 - Remove workaround for fixed Django bug 1311433 (LP: #1311433)
39 - Ensure that validation errors are returned when adding a node over
40 the API and its cluster controller is not contactable. (LP: #1305061)
41 - Hardware enablement support for PowerKVM
42 - Shorten the time taken for a cluster to initially connect to the region
43 via RPC to around 2 seconds (LP: #1317682)
44 - Faster DHCP leases parser (LP: #1305102)
45 - Documentation fixed explaining how to enable an ephemeral backdoor
46 (LP: #1321696)
47 - Use probe-and-enlist-hardware to enlist all virtual machine inside
48 a libvirt machine, allow password qemu+ssh connections.
49 (LP: #1315155, LP: #1315157)
50 - Rename ppc64el boot loader to PowerKVM (LP: #1315154)
51 * debian/control:
52 - Add missing dependency in maas-cluster-controller for python-pexpect
53
54 -- Julian Edwards <julian.edwards@canonical.com> Mon, 26 May 2014 10:56:33 +1000
55
56maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium
57
58 * New upstream release
59 - Add support to install Third Party Drivers. In order for this to be
60 used the user will have to go to the Settings page to enable the
61 installation of these drivers. (LP: #1305839)
62 - Use release images instead of daily. (LP: #1306701)
63 - Quote interface name in dhcpd.template, otherwise DHCP server fails
64 to start. (LP: #1306335)
65 - Fix IntegrityError, when multiple processes are trying to register
66 the same component. (LP: #1307415)
67 - Add missing armhf commissioning template (LP: #1307780)
68 * debian/maas-region-controller-min.install: Install drivers.yaml.
69 * debian/maas-region-controller.postinst: No longer show the
70 installation note by default. (LP: #1284652)
71
72 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Apr 2014 19:02:00 -0400
73
74maas (1.5+bzr2236-0ubuntu1) trusty; urgency=medium
75
76 * New upstream bugfix release.
77 - Fix simplestreams path to use the new data source path. (LP: #1305118)
78 - Fix commissioning_distro_series validation failure. (LP: #1304408)
79 - Fix DB migration 0072_remove_ipmi_autodetec. (LP: #1302156)
80 - Update documentation.
81 * debian/maas-region-controller-min.maas-region-celery.upstart,
82 debian/maas-region-controller-min.maas-txlongpoll.upstart: Fix ISO
83 install by making sure rabbitmq user is really created if it does not
84 exist (LP: #1298559)
85
86 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Apr 2014 18:36:55 -0400
87
88maas (1.5+bzr2230-0ubuntu1) trusty; urgency=medium
89
90 * New upstream bugfix release:
91 - Fix Cluster Controller to handle deprecated config items gracefull.
92 Otherwise it fails on upgrades. (LP: #1302772)
93 - Fix documentation generation and referencing. (LP: #1302956)
94 - Ensure we PXE boot when we turn on SM15K systems. (LP: #1303915)
95
96 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 07 Apr 2014 10:26:51 -0400
97
98maas (1.5+bzr2227-0ubuntu1) trusty; urgency=medium
99
100 * New upstream bugfix release:
101 - Fix catching exceptions raised by
102 twisted.conch.ssh.keys.Key.fromString (LP: #1298788)
103 - Fix validationg in default NodeGroupInterface.broadcast_ip making it
104 optional. (LP: #1299374)
105 - Drop install-pxe-bootloader as it conflicts with newer import script.
106 - Remove references to old import script.
107 - Fix changes that cause overwriting of existing entries.
108 - Fix inappropriate ValidationError when defining networks with nested
109 (but non-identical) address ranges. (LP: #1299114)
110 - Fix issue where if a node does not provide an architecture type on dhcp
111 request, or no other boot method is available for that architecture,
112 the node still uses pxelinux.0 to boot. (LP: #1300285)
113 - Take an advisory lock to prevent concurrent creation of the
114 eventloops table. (LP: #1300363)
115 - Remove the cloud_images_archive setting, as it conflicts with new
116 import script. (LP: #1300587)
117 - Add a 'logout confirmation' page. Using this, the logout action is
118 protected against CSRF attacks because it uses a POST request, in
119 conjunction with Django's CSRF protection feature. (LP: #1298790)
120 - Fix cluster listings when dealing with large number of clusters by
121 paginating it. (LP: #1301242)
122 - Change list_boot_images() so that it can cope with a missing boot
123 images directory: this happens if the reporting task runs before the
124 images have been imported. (LP: #213984)
125 - Fix internal server error on fast path installer. (LP: #1293676)
126 - Fix uploading files using maas-cli. (LP: #1187826)
127 - Fix SM15k Invalid Power Control and Fix enlisting machines with
128 2.0 api. (LP: #1302818, LP: #1302819)
129
130 [ Andres Rodriguez ]
131 * debian/maas-cluster-controller.install: Install UEFI templates
132 * debian/maas-cluster-controller.dirs: Create 'boot-resources' dir.
133
134 [ Jason Hobbs ]
135 * debian/extras/99-maas: Allow access to keyserver.ubuntu.com via
136 squid-deb-proxy.
137
138 [Jeroen Vermeulen]
139 * debian/maas-cluster-controller.postinst:
140 - Make the tgt config link point to the new boot-resources dir.
141 * debian/maas-region-controller-min.dirs:
142 - Don't create /var/lib/maas/tftp.
143
144 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 03 Apr 2014 13:45:02 -0400
145
146maas (1.5+bzr2204-0ubuntu1) trusty; urgency=low
147
148 * New upstream release (LP: #1281881)
149
150 [ Andres Rodriguez ]
151 * debian/maas-region-controller-min.templates: Set installation note to false
152 by default.
153 * Check rabbitmqctl is present before running commands:
154 - debian/maas-region-controller-min.maas-region-celery.upstart.
155 - debian/maas-region-controller-min.maas-txlongpoll.upstart.
156 * make sure maas_longpoll rabbitmq user is created/with correct password on
157 a package reconfigure.
158 * debian/maas-dns.postinst: Fix upgrade setup of named.conf.options.
159 * debian/maas-cluster-controller.install: Install UEFI templates (LP: #1299143)
160
161 [ Julian Edwards ]
162 * debian/extas/maas: Echo warning to stderr so json stdout is not polluted
163 * debian/maas-cluster-controller.postinst: Run upgrade-cluster on each
164 upgrade
165 * debian/maas-dns.postinst: Call edit_named_options to add a line in
166 /etc/bind/named.conf.options that includes the
167 /etc/named/maas/named.conf.options.inside.maas file.
168 * debian/control:
169 - maas-dns depends on python-iscpy
170 - maas-cluster-controller depends on python-seamicroclient
171 * debian/maas-cluster-controller.install: Install bootresources.yaml
172
173 [ Dustin Kirkland ]
174 * debian/control: LP: #1297097
175 - clean up package descriptions, modernize, and more clearly/simply
176 explain what each package does
177 - drop "Ubuntu" in front of MAAS, clean up command line/API description
178
179 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 28 Mar 2014 10:43:53 -0400
180
181maas (1.5+bzr1977-0ubuntu1) trusty; urgency=low
182
183 * New upstream bugfix release.
184 - setup.py: Install missing shell snippet
185
186 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 19 Feb 2014 16:31:45 -0500
187
188maas (1.5+bzr1976-0ubuntu1) trusty; urgency=low
189
190 * New upstream release.
191 * debian/maas-cluster-controller.postinst: Make sure upgrades handle
192 authbind upgrades too.
193
194 -- Andres Rodriguez <andreserl@ubuntu.com> Sun, 16 Feb 2014 22:56:36 -0500
195
196maas (1.5+bzr1951-0ubuntu1) trusty; urgency=low
197
198 * New upstream release
199 * debian/maas-cluster-controller.postinst: Also authbind port 69.
200 * debian/maas-cluster-controller.maas-pserv.upstart: Export MAAS_URL.
201
202 -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 16:16:38 -0500
203
204maas (1.5+bzr1948-0ubuntu2) trusty; urgency=low
205
206 * debian/maas-cluster-controller.postinst: Make sure generator on
207 pserv.yaml is updated on upgrade or reconfigure. (LP: #1273197)
208 * debian/maas-cluster-controller.maas-pserv.upstart: Make sure maas-pserv
209 is started with authbind.
210
211 -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 13:55:20 -0500
212
213maas (1.5+bzr1948-0ubuntu1) trusty; urgency=low
214
215 * New upstream release.
216
217 [ Graham Binns ]
218 * debian/control: Depends on python-jsonschema.
219
220 [ Andres Rodriguez ]
221 * debian/maas-region-controller-min.posinst: Make txlongpoll.yaml only
222 readable by the app and not world readeable.
223 * debian/patches/02-pserv-config.patch: Refreshed.
224
225 [ Julian Edwards ]
226 * debian/extras/maas-cli renamed to debian/extras/maas, and introduce
227 a deprecation warning in favour of using maas over maas-cli.
228 * debian/extras/maas renamed to debian/extras/maas-region-admin
229 * debian/maas-cli.install: install debian/extras/maas
230 * debian/maas-dns.postinst: Invoke maas-region-admin instead of maas
231 * debian/maas-region-controller-min.install: install maas-region-admin
232 instead of maas
233 * debian/maas-region-controller.postinst: Invoke maas-region-admin instead
234 of maas
235 * debian/maas-cli.links: Link from maas to maas-cli for backward compat.
236
237 [ Seth Arnold ]
238 * debian/maas-region-controller-min.postinst: Make sure txlongpoll.yaml
239 gets correct permissions on upgrade (LP: #1254034)
240
241 -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 12:08:23 -0500
242
243maas (1.5+bzr1909-0ubuntu1) trusty; urgency=low
244
245 * New upstream release.
246
247 [ Dustin Kirkland ]
248 * debian/maas-region-controller-min.postinst: Fix typo in sed. Remove
249 double quotes. (LP: #1274448)
250
251 [ Andres Rodriguez ]
252 * debian/control: Add depends on python-crochet.
253 * Get rid of dfsg on the versioning as we no longer strip any code from
254 the orig tarball.
255 - debian/rules: Do not strip any files out of the tarball.
256 * debian/patches/*: Refreshed.
257
258 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 31 Jan 2014 09:38:51 -0500
259
260maas (1.4+bzr1853+dfsg-0ubuntu1) trusty; urgency=low
261
262 * New upstream release
263
264 -- Dustin Kirkland <kirkland@ubuntu.com> Tue, 28 Jan 2014 08:41:41 +0000
265
266maas (1.4+bzr1849+dfsg-0ubuntu1) trusty; urgency=low
267
268 * New upstream release.
269
270 [ Gavin Panella ]
271 * debian/control: Remove all dependencies on Avahi and DBUS.
272
273 -- Julian Edwards <julian.edwards@canonical.com> Tue, 28 Jan 2014 17:12:22 +1000
274
275maas (1.4+bzr1820+dfsg-0ubuntu1) trusty; urgency=low
276
277 * New upstream Release.
278
279 [ Jeroen Vermeulen ]
280 * Move maas-probe-dhcp from maas-dhcp to python-maas-provisioningserver.
281
282 [ Andres Rodriguez ]
283 * debian/maas-region-controller.postinst: Make sure maas-txlongpoll and
284 maas-region-celery get restarted.
285 * debian/control:
286 - python-maas-provisioningserver Breaks/Replaces for maas-dhcp due to
287 moving files around packages.
288 - Suggests ipmitool, libvirt-bin, amtterm.
289
290 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 15 Jan 2014 00:24:58 -0500
291
292maas (1.4+bzr1817+dfsg-0ubuntu1) trusty; urgency=low
293
294 * New upstream release
295
296 [ Andres Rodriguez ]
297 * debian/maas-dns.postinst: Drop write_dns_config as this is run by
298 celery jobs.
299 * debian/maas-region-controller.templates: Rename template to
300 maas-region-controller-min.templates
301 * debian/control: Depends on python-amqp; Conflicts on python-librabbitmq.
302
303 [ Julian Edwards ]
304 * New maas-probe-dhcp script to detect DHCP servers
305 - debian/extras/maas-probe-dhcp: New script
306 - debian/maas-dhcp.install: Install new maas-probe-dhcp script
307 - maas-dhcp.lintian-overrides: New maas-probe-dhcp script has no manpage
308
309 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 15 Jan 2014 00:23:44 -0500
310
311maas (1.4+bzr1789+dfsg-0ubuntu1) trusty; urgency=low
312
313 * New upstream release
314
315 [ Jeroen Vermeulen ]
316 * Keep legacy import_ephemerals config for now.
317
318 [ Andres Rodriguez ]
319 * debian/maas-region-controller.postinst: Allo default-maas-url debconf
320 option to be preseeded.
321 * Make use of authbind to allow maas-cluster-celery bind port as non-root.
322 - debian/control: Depends on authbind for maas-cluster-controller.
323 - debian/maas-cluster-controller.{postinst,postrm}: Handle creation
324 and removal of required authbind file.
325 * Split maas-region-controller into maas-region-controller-min.
326 - debian/maas-region-controller-min.{postinst,postrm,prerm}: Handle
327 basic configuration for rsyslogd, squid-deb-proxy, and maas-url.
328 - debian/control: Depends on maas-region-controller-min, postgresql
329 and rabbitmq-server for maas-region-controller.
330
331 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 10 Oct 2013 17:07:51 -0400
332
333maas (1.4+bzr1693+dfsg-0ubuntu1) saucy; urgency=low
334
335 * New Upstream Release (LP: #1218526)
336 - This new upstream release contains fixes and improvements of the
337 features approved by the FFe above.
338 - Fixes commissioning failure on Saucy with 'Failed Test' (LP: #1237364)
339 - Fixes access of static images over http (LP: #1236544)
340 * d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544)
341 * d/control: Bump depends on python-django to 1.4. (LP: #1236572)
342 * d/maas-dhcp.postinst: Fail gracefully if apparmor_parser fails, allowing
343 to install maas-dhcp during an ISO install. (LP: #1236786)
344
345 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 04 Oct 2013 12:33:05 -0400
346
347maas (1.4+bzr1656+dfsg-0ubuntu2) saucy; urgency=low
348
349 * debian/control: Recommends on maas-dns instead of Depends for region
350 because maas-dns needs the region installed first.
351
352 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 03 Oct 2013 10:36:20 -0400
353
354maas (1.4+bzr1656+dfsg-0ubuntu1) saucy; urgency=low
355
356 [ Andres Rodriguez ]
357 * New upstream bugfix release.
358 - Respect filters for ephemerals_script.py.
359 * debian/control: Depends on ubuntu-cloudimage-keyring instead of
360 ubuntu-cloud-keyring; depends on python-distro-info.
361 * debian/control: Remove suggests on maas-dhcp and maas-dns as they are
362 now dependencies.
363
364 [ Scott Moser ]
365 * debian/control: Bump depends on isc-dhcp-server to 4.2.4
366 * debian/maas-dhcp.maas-dhcp-server.upstart: Change ownership of leases
367 file to root:root, and run the daemon as dhcpd:dhcpd.
368
369 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 01 Oct 2013 15:26:34 -0400
370
371maas (1.4+bzr1655+dfsg-0ubuntu1) saucy; urgency=low
372
373 * New Upstream release. (LP: #1218526)
374 * debian/control:
375 - Depends on python-djorm-ext-pgarray, python-curtin,
376 python-simplestreams, ubuntu-cloud-keyring.
377 - Depends on maas-dns, maas-dhcp to get them seeded and
378 into main (LP: #1227353)
379
380 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 28 Aug 2013 11:17:44 -0400
381
382maas (1.4+bzr1551+dfsg-0ubuntu1) saucy; urgency=low
383
384 * New upstream release
385
386 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Aug 2013 16:20:41 -0400
387
388maas (1.4+bzr1548+dfsg-0ubuntu1) saucy; urgency=low
389
390 * New upstream release
391
392 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 18 Jul 2013 10:15:10 -0400
393
394maas (1.4+bzr1539+dfsg-0ubuntu1) saucy; urgency=low
395
396 * New upstream release
397 * Symlink apache2 config into /etc/apache2/conf-enabled/ instead of
398 /etc/apache2/conf.d as apache2.4 no longer supports the latter.
399 - debian/maas-cluster-controller.{postinst,postrm}
400 - debian/maas-region-controller.{postinst,postrm}
401 * debian/control: Bump Standards-Version to 3.9.4.
402 * debian/maas-cluster-controller.lintian-overrides: Remove unneeded
403 override and add a new one.
404 * debian/maas-region-controller.lintian-overrides: Add extra overrides.
405
406 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 03 Jul 2013 17:11:02 -0400
407
408maas (1.4+bzr1538+dfsg-0ubuntu1) saucy; urgency=low
409
410 * New upstream release
411 * debian/patches/04-setup-dont-user-list-snippets.patch: Drop. Merged
412 Upstream.
413
414 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 13 Jun 2013 20:06:35 -0400
415
416maas (1.4+bzr1527+dfsg-0ubuntu1) saucy; urgency=low
417
418 * debian/patches/04-setup-dont-user-list-snippets.patch: Drop importing
419 maasserver modules to list snippets in favor to using glob. Otherwise
420 we would have to add various non necessary Build-Dependencies.
421
422 [ Jeroen Vermeulen ]
423 * Install templates into /etc/maas/templates/.
424
425 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 03 Jun 2013 17:59:31 -0400
426
427maas (1.4+bzr1505+dfsg-0ubuntu1) saucy; urgency=low
428
429 * New upstream release
430
431 [ Steve Langasek ]
432 * Add missing dependency on iproute to maas-region-controller, for use of
433 /sbin/ip in postinst.
434
435 [ Julian Edwards ]
436 * debian/maas-dhcp.maas-dhcp-server.upstart:
437 - Detect 12.04 as the host OS and install with correct permissions. This
438 allows the same packaging to be used in the 12.04 backport.
439
440 [ Andres Rodriguez ]
441 * Update packaging to support FPI:
442 - debian/control: Depends on apache2 for maas-cluster-controller.
443 - debian/maas-cluster-controller.install: Install http config file.
444 - debian/maas-cluster-controller.{postinst,postrm}: Handle symlink creation
445 and deletion.
446 * debian/maas-region-controller.install: Install preseeds in
447 etc/maas/preseeds. (LP: #1073463)
448
449 [ Jeroen Vermeulen ]
450 * In the source tree, /etc/maas/pserv.yaml has moved from etc/ to etc/maas/.
451 * Install templates into /etc/maas/templates/.
452
453 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 03 Jun 2013 16:53:14 -0400
454
455maas (1.3+bzr1455+dfsg-0ubuntu1) raring; urgency=low
456
457 * New upstream bugfix release.
458 - Fixes and returns the 'resource_url' with the 'canonical' url for
459 a file that is fetched using the API (LP: #1154142)
460
461 [ Andres Rodriguez ]
462 * debian/control:
463 - Change Conflicts/Replaces for Breaks/Replaces.
464 - Conflicts on tftpd-hpa and dnsmasq.
465 - Do not pre-depends, but Depends on ${misc:Depends} for 'maas'.
466
467 [ Steve Langasek ]
468 * postinst scripts are never called with 'reconfigure' as the script
469 argument. Remove references to this (mythical) invocation.
470 * always call 'set -e' from maintainer scripts instead of passing 'sh -e'
471 as the interpreter, so that scripts will behave correctly when run via
472 'sh -x'.
473 * invoke-rc.d is never allowed to not exist - simplify scripts (and make
474 them better policy-compliant) by invoking unconditionally. (The only
475 possible exception is in the postrm, where it's *theoretically* possible
476 for invoke-rc.d to be missing if the user has completely stripped
477 down their system; that's a fairly unreasonable corner case, but we
478 might as well be correct if it ever happens.)
479 * db_get+db_set is a no-op; don't call db_set to push back a value we just
480 got from db_get.
481 * Omit superfluous calls to 'exit 0' at the end of each script.
482 * Remove maas-cluster-controller prerm script, which called debconf for no
483 reason.
484 * Don't invoke debconf in the postrm script either, debhelper already does
485 this for us.
486 * Other miscellaneous maintainer script fixes
487 * debian/maas-common.postinst: call adduser and addgroup unconditionally;
488 the tools are already designed to DTRT, we don't need to check for the
489 user/group existence before calling them nor should we worry about
490 calling them only once on first install.
491 * debian/maas-common.postrm: delete the maas group, not just the user,
492 as the comment in the code implies we should do.
493
494 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 19 Mar 2013 15:38:22 -0400
495
496maas (1.3+bzr1452+dfsg-0ubuntu1) raring; urgency=low
497
498 * New upstream release.
499 - MAAS file storage mechanism is shifting from a single shared
500 namespace to a per-user namespace. Operators of the majority
501 of MAAS systems will not notice any change. However, operators
502 of the most complex installations may find that a new
503 "shared-environment" user is created, and that some resources
504 are reassigned to it, such as API credentials and SSH public
505 keys. This provides a transitional environment that mimics the
506 behaviour of a shared namespace.
507
508 [ Raphaël Badin ]
509 * debian/control: maas-region-controller depends on bind9utils.
510 (LP: #1103195)
511 * debian/maas-dns.postinst: Call write_dns_config.
512 (LP: #1085865).
513 * debian/maas-cluster-controller.postinst: Fix the name of the config
514 file (/etc/maas/pserv.yaml and not /etc/maas/pserv.conf)
515 (LP: #1083542).
516 * debian/extras/99-maas-sudoers: Add 'SETENV:' to sudo rule
517 to allow preserving the environment when running
518 /usr/sbin/maas-import-pxe-files via sudo.
519 * debian/maas-dns.postinst: fix permissions and group ownership of
520 file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935)
521 * debian/control: Remove the dependency of maas-cluster-controller
522 on rabbitmq-server. (LP: #1072744)
523 * debian/extras/99-maas-sudoers: Add sudo rule for script
524 /usr/sbin/maas-import-pxe-files.
525 * debian/maas-cluster-controller.install: Removed commissioning-user-data
526 script.
527
528 [ Julian Edwards ]
529 * debian/maas-region-controller.install: Remove installation of maas-gc; it
530 is no longer required as upstream no longer stores files in the filesystem.
531 (LP: #1069734)
532 * debian/maas-cluster-controller.postinst: Ensure that /etc/maas/pserv.yaml
533 is updated when reconfiguring. (LP: #1081212)
534
535 [ Jeroen Vermeulen ]
536 * debian/maas-cluster-controller.install: Install import scripts.
537 * debian/maas-cluster-controller.postinst: Configure tgt (the iSCSI server)
538 so the import script can install files to it.
539 * debian/maas-cluster-controller.postrm: Clean up tgt config.
540 * debian/maas-region-controller.install: Move import scripts out to the
541 cluster controller, and drop the maas-import-isos compatibility script.
542 * debian/maas-region-controller.postinst: Remove tgt config.
543 * debian/maas-region-controller.postrm: Remove tgt config cleanup.
544 * Bump code revision to include latest user_data.template fixes.
545
546 [ Gavin Panella ]
547 * debian/extras/99-maas: squashfs image download is no longer needed.
548 * debian/maas-cluster-controller.install: maas-import-squashfs and its
549 configuration file are no longer part of upstream.
550 * debian/maas-cluster-controller.install: The maas-import-pxe-files cron
551 task is no longer used.
552 * debian/maas-cluster-controller.postinst: Remove leading comment
553 markers from the 'generator' line in pserv.yaml.
554
555 [ Andres Rodriguez ]
556 * debian/control:
557 - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
558 - maas-dns: Conflicts with dnsmasq
559 - maas-cluster-controller Conflicts/Replaces maas-region-controller as
560 import scripts are no longer shipped in the region.
561 - debian/control: Depends on distro-info for maas-cluster-controller
562 instead of maas-region-controller (LP: #1103194)
563 * debian/maas-cluster-controller.config: If URL has been detected,
564 add /MAAS if it doesn't contain it. This helps upgrades from versions
565 where DEFAULT_MAAS_URL didn't use /MAAS.
566
567 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 04 Mar 2013 11:49:44 -0500
568
569maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
570
571 * New upstream bugfix release
572 - Fixes commissioning failing to set memory attribute. (LP: #1064638)
573 - Fixes node listing by adding pagination (LP: #1064672)
574 - Changes default bind rndc key which breaks initscripts (LP: #1066938)
575 - Fixes invalid DNS config once node is enlisted (LP: #1066958)
576 - Reference documentation link to correct URL (LP: #1067261)
577
578 [ Andres Rodriguez ]
579 * debian/rules: Change upstream branch.
580
581 [ Gavin Panella ]
582 * debian/maas-dns.postinst: Remove MAAS-related include lines from named's
583 config before adding a new one (LP: #1066929)
584
585 [ Raphael Badin ]
586 * debian/extras/maas-region-celeryd: Remove whitespace that affects DNS
587 rabbitmq queue. (LP: #1067929)
588
589 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 16 Oct 2012 10:31:37 -0400
590
591maas (0.1+bzr1264+dfsg-0ubuntu2) quantal; urgency=low
592
593 * Fix MAAS not working after CD/preseed install (LP: #1065763)
594 - debian/extras/maas-region-celeryd: Add wrapper to run celery from
595 the upstart job.
596 - debian/extras/maas-region-controller.maas-region-celery.upstart: Create
597 rabbitmq user if it does not exists.
598 * debian/control: Remove unneeded deps on python-txtftp for some binary pkgs.
599 * debian/maas-region-controller.postinst: Minor fix referencing variable.
600
601 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 11 Oct 2012 17:38:08 -0400
602
603maas (0.1+bzr1264+dfsg-0ubuntu1) quantal; urgency=low
604
605 * New upstream release.
606
607 [ Raphaël Badin ]
608 * debian/maas-region-controller.postinst: Enable proxy_http module.
609 * debian/maas-cluster-controller.postinst: Create /var/lib/maas. (LP: #1065062)
610
611 [ Andres Rodriguez ]
612 * Install maas-provision with python-maas-provisioningserver (LP: #1065171):
613 - debian/python-maas-provisioningserver.install: Install
614 - debian/control: Add Conflicts/Replaces with maas-cluster-controller
615 to handle upgrades.
616 * debian/patches/04-fix-ipmi-enlistment.patch: Drop. Merged Upstream.
617 * debian/control: Depends on maas-region-controller for maas-dns.
618 * debian/maas-region-controller.postinst: Set the correct host for
619 BROKER_URL (LP: #1065080)
620 * Handle creation of user/group in maas-common.
621 * debian/maas-region-controller.config: Always source dbconfig scripts.
622
623 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Oct 2012 11:17:21 -0400
624
625maas (0.1+bzr1243+dfsg-0ubuntu3) quantal; urgency=low
626
627 * 04-fix-ipmi-enlistment.patch: retry maas-enlist without power parameters
628 on failure. This allows enlistment to continue working with Precise
629 ephemeral images before the Precise SRU for maas-enlist lands.
630 (LP: #1064922).
631
632 -- Robie Basak <robie.basak@canonical.com> Wed, 10 Oct 2012 13:29:16 +0000
633
634maas (0.1+bzr1243+dfsg-0ubuntu2) quantal; urgency=low
635
636 * debian/patches/99-ipmi-user-too-long.patch: Fix username too long for
637 IPMI user created on enlistment (LP: #1064832)
638
639 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Oct 2012 01:00:29 -0400
640
641maas (0.1+bzr1243+dfsg-0ubuntu1) quantal; urgency=low
642
643 * New upstream release. (LP: #1064596)
644 * debian/patches/99-temporary-fix-constraints.patch: Dropped.
645 * debian/control:
646 - ${python:Depends} for maas-common.
647 - Add missing Depends for python-maas-provisioningserver (LP: #1064542)
648 * debian/maas-cluster-controller.postinst: Create /var/log/maas if it
649 doesn't exist (LP: #1064539)
650
651 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 08 Oct 2012 17:02:56 -0400
652
653maas (0.1+bzr1223+dfsg-0ubuntu1) quantal; urgency=low
654
655 * New upstream release. (LP: #1062518)
656
657 [ Julian Edwards ]
658 * Split packaging of 'maas' into maas-{region,cluster}-controller
659 - debian/control: Update accordingly.
660 - debian/*.install: Move files accordingly
661 - debian/*.{postinst,postrm,preinst}: Move files accordingly.
662 * Ensure isc-dhcp-server is disabled when installing maas-dhcp.
663 * Ensure maas-dns creates the maas user before trying to chown files.
664 * Make maas-cluster-controller autoconfigure itself when upgrading from the
665 old maas package. (LP: #1059416)
666 * Add missing prerm file for maas-cluster-controller so that .pyc files
667 are cleaned up. (LP: #1059973)
668
669 [ Raphaël Badin ]
670 * Install maas_local_celeryconfig.py in /etc/maas and symlink to
671 /usr/share/maas.
672 * debian/maas.postinst: Create rabbitmq celery user/vhost.
673 * debian/maas.postinst: Update BROKER_URL in maas_local_celeryconfig.py.
674 * Use maas_local_celeryconfig_cluster.py as the local celery
675 configuration file for the cluster worker.
676 * debian/maas-region-controller.maas-region-celery.upstart: Add region
677 worker upstart script.
678 * Rename cluster worker upstart script into
679 maas-cluster-controller.maas-clluster-celery.upstart.
680 * maas-cluster-controller.maas-celery.upstart: use "celeryconfig_cluster"
681 as the Celery config module.
682 * debian/maas-common.install: Install celeryconfig_common.py.
683 * debian/maas-cluster-controller.install: Install celeryconfig_cluster.py.
684 * debian/maas-region-controller.install: Install celeryconfig.py.
685 * Split celery config into cluster and region configs.
686 * Add region celeryd upstart config.
687 * Define CELERY_CONFIG_MODULE in
688 maas-cluster-controller.maas-cluster-celery.upstart
689
690 [ Jeroen Vermeulen ]
691 * Make maas_local_celery_config.py non-world readable.
692 * Make maas_local_celeryconfig_cluster.py non-world readable.
693 * Set root:maas ownership of local cluster config only *after*
694 the maas user/group have been created
695
696 [ Andres Rodriguez ]
697 * debian/maas.postinst:
698 - Always restart apache2.
699 - Handle upgrades for new upstream release.
700 - Handle upgrades for celery rabbitmq worker.
701 * Add binary package to install client tool.
702 - debian/extras/maas-cli: Add binary.
703 - debian/maas-cli.install: Add. Install maascli and apiclient.
704 - debian/control: Add binary package.
705 * debian/control:
706 - Depends on freeipmi-tools instead of ipmitool.
707 - Conflicts/Replaces on maas for python-maas-client.
708 - Depends on python-netifaces, python-lxml.
709 * Add python-maas-client binary package:
710 - debian/python-maas-client.install: Add. Install 'apiclient' python module.
711 - debian/control: Add package. python-django-maas and maas-cli now
712 Depend on it.
713 * debian/rules: Install maas-dhcp-server upstart job.
714 * debian/maas.postrm: Remove celery worker rabbitmq user and host.
715 * debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job
716 instead of isc-dhcp-server (LP: #1055951)
717 * debian/maas-region-controller.postinst: Cleanup upgrade rules.
718 * debian/maas-cluster-controller.postinst: Fix 'local' usage.
719 * debian/maas-common.install: Install celeryconfig in appropriate location.
720 * debian/maas-cluster-controller.postrm: Add and delete maas user.
721 * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server.
722 * debian/maas-region-controller.postinst:
723 - Always update passwords on upgrade. No longer check versioning. (LP: #1060094).
724 - Add MAAS server to allowed mirror in squid-deb-proxy
725 - Source dbconfig conf file for maas-region-controller on upgrade because
726 it writes a new config file and no longer preservers the previous password.
727 * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}.
728 * debian/maas-region-controller.install: Install maas-import-squashfs
729 * Handle removal of non existant files (LP: #1059556):
730 - debian/maintscript: Added to handle removal of conffiles.
731 - debian/control: Add Pre-depends and bump debhelper version.
732 * update po files for the templates.
733 * debian/extras/99-maas: Install in usr/share/maas/conf and symlink to the
734 appropriate etc dir.
735 * debian/maas-cluster-controller.config: Source debconf at the beginning of the
736 script. (LP: #1063857)
737 * debian/patches/99-temporary-fix-constraints.patch: Fix constraints maaping
738 when deploying with juju. Temporary until it gets merged upstream
739
740 [ Robie Basak ]
741 * Add maas-cluster-controller dependency on uuid-runtime, needed for uuidgen
742 by postinst.
743
744 [ Scott Moser ]
745 * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into
746 /etc/apparmor.d/dhcpd.d (LP: #1049177), and update apparmor profile for
747 /usr/sbin/dhcpd on install/remove
748 * get the ip address for the dhcp server in config
749
750 [ Diogo Matsubara ]
751 * Add initial tests to be run by autotests:
752 - debian/control: XS-Testsuite: autopkgtest
753 - debian/tests/control: Add
754 - debian/tests/maas-package-test: Add
755 - tests/maas-integration.py: Add
756
757 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 08 Oct 2012 13:10:23 -0400
758
759maas (0.1+bzr971+dfsg-0ubuntu2) quantal; urgency=low
760
761 * debian/extras/99-maas-sudoers: Add missing rule for
762 maas-provision. (LP: #1046397)
763
764 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 05 Sep 2012 12:36:58 -0400
765
766maas (0.1+bzr971+dfsg-0ubuntu1) quantal; urgency=low
767
768 * New upstream release (LP: #1044367)
769
770 [ Julian Edwards ]
771 * Fix 02-pserv-config.patch to handle new default tftp directory
772
773 [ Andres Rodriguez ]
774 * debian/maas.postinst:
775 - include '/MAAS' for DEFAULT_MAAS_URL.(LP: #1033956)
776 - Update bzr version to safely upgrade.
777 * Add maas-dns package that configures DNS in MAAS (LP: #1030860)
778 * Remove cobbler related bits
779 - debian/maas.postinst: Drop cobbler configuration
780 - debian/maas.install: Drop installation of snippets/preseeds.
781 - debian/control:
782 + Drop Depends on maas-provision. (LP: #975473)
783 + Depends on bind9utils.
784 + Depends on python-lockfile (LP: #1037400)
785 Add necessary Conflicts/Replaces. Add conflicts to tftpd-hpa and dnsmasq.
786 Depends on isc-dhcp-server for maas-dhcp, and syslinux-common.
787 - debian/extras/maas-provision: Add missing "$@" (LP: #1040462)
788 - debian/patches:
789 + 02-pserv-config.patch: Updated. Do not patch cobbler related bits.
790 patch tftp config to default.
791 * maas-dhcp: Re-add to handle initial configuration of MAAS DHCP server.
792 * Allow restart of 'isc-dhcp-server' by adding a sudoers file:
793 - debian/extras/99-maas-sudoers: Added.
794 - debian/maas.install: Install 99-maas-sudoers
795 * Minor improvements on dbconfig-common handling:
796 - debian/maas.config: Only call dbc_go when scripts present.
797 - debian/maas.postrm: Only call dbc_go when config file exists.
798 * debian/maas.maas-celery.upstart: Enable Beat and set scheduler db file.
799 * debian/maas-dns.postinst: Set correct permissions. (LP: #1042868)
800 * debian/maas-dhcp.config:
801 - Ask whether we want to enable DHCP (LP: #1044229)
802 - Add debconf question for network interfaces
803 * debian/maas.prerm: Stop services before removing database (LP: #1044559)
804
805 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 02 Aug 2012 09:01:43 -0400
806
807maas (0.1+bzr777+dfsg-0ubuntu1) quantal-proposed; urgency=low
808
809 * New upstream release
810 * Only run 'maas' command as root. (LP: #974046)
811 - debian/extras/maas: Check id.
812 - debian/maas.install: Install in 'sbin'.
813 * debian/maas.postinst:
814 - restart apache2 after everything gets processed.
815 - Update version to handle upgrades.
816 * debian/extras/maas-provision: Add wrapper to access 'maasprovisiong'
817 command line.
818 * debian/patches/99_temporary_fix_path.patch: Dropped. No longer needed.
819
820 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Jul 2012 08:28:36 -0400
821
822maas (0.1+bzr745+dfsg-0ubuntu2) quantal; urgency=low
823
824 * debian/control: Build-Dep on python-django instead of
825 python-django-configglue
826
827 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Jul 2012 08:24:25 -0400
828
829maas (0.1+bzr745+dfsg-0ubuntu1) quantal; urgency=low
830
831 * New Upstream Release
832 * debian/patches:
833 - 99_power_fixes.patch: Dropped. Merged Upstream.
834 - 99_enums_js.patch: Dropped. No longer needed.
835 * Automatically build enums.js:
836 - debian/control: Build-Depends on python-django-configglue
837 - debian/rules: Build and install enums.js.
838 * debian/maas.postinst: Update version to handle upgrades
839
840 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 12 Jul 2012 16:34:11 -0400
841
842maas (0.1+bzr740+dfsg-0ubuntu1) quantal; urgency=low
843
844 * New upstream release
845 * debian/control: Depends on python-txtftp.
846 * debian/rules: Do not ship python-tx-tftp.
847 * debian/maas.postinst: Update version to upgrade successfully.
848 * debian/patches:
849 - 02-pserv-config.patch: Refreshed.
850 - 99_enums_js.patch: Updated.
851 - 99_power_fixes.patch: Added temporarily to enable IPMI
852 - 99_temporary_fix_path.patch: Added temporarily to not fail when
853 importing celeryconfig
854
855 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Jul 2012 17:54:49 -0400
856
857maas (0.1+bzr709+dfsg-0ubuntu1) quantal; urgency=low
858
859 * New Upstream release
860 * debian/control:
861 - Depends on python-celery, python-tempita, libjs-yui3-{full,min},
862 libjs-raphael
863 * debian/maas.install:
864 - Install apiclient, celeryconfig.py, maas-import-pxe-files, preseeds_v2.
865 - Update to install various files from chroot, rather tha manually copy
866 them from the source.
867 * debian/maas.links: symlink celeryconfig.py
868 * debian/maas.maas-celery.upstart: Add job.
869 * debian/rules:
870 - Install celery upstart job.
871 - Do not install jslibs as packages are now used.
872 - Drop copying of maas_local_settings_sample.py as source now ships
873 a maas_local_settings.py
874 * debian/patches:
875 - 04-maas-http-fix.patch: Drop. Merged upstream.
876 - 01-fix-database-settings.patch: Refreshed.
877 - 99_enums_js.patch: Added until creation of enum.js / build process
878 is fixed.
879 * debian/maas.postinst: Update bzr version to correctly handle upgrades.
880
881 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Jul 2012 17:42:37 -0400
882
883maas (0.1+bzr482+dfsg-0ubuntu1) precise; urgency=low
884
885 * New upstream release (Fixes LP: #981103)
886 * debian/maas.postinst:
887 - Make sure rabbitmq and postgresql are started on upgrade (LP: #981282)
888 - Handle upgrades from any lower than 0.1+bzr462+dfsg-0ubuntu1 to
889 correctly re-generate passwords, and not have db sync/migrate issues
890 as config has changed upstream.
891 - Correctly set Passwords for PSERV, otherwise it won't set new passwords.
892 * Allow MAAS_DEFAULT_URL reconfiguration. (LP: #980970)
893 - debian/maas.config: Add reconfigure validation to correctly allow it,
894 and ask a question.
895 - debian/maas.postinst: Reconfigure DEFAULT_MAAS_URL as well as cobbler
896 server and next_server for PXE/Provisioning.
897 - debian/maas.templates: Add debconf question and update info.
898 * Do not lose MAAS_DEFAULT_URL settings on upgrade (LP: #984309)
899 * debian/maas.postinst:
900 - Set cobbler password in between quotes (LP: #984427)
901 - Do not change permissions to maas.log (LP: #980915)
902 * no longer use maas-cloudimg2ephemeral, but rather use premade images
903 at http://maas.ubuntu.com
904
905 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Apr 2012 23:44:46 -0700
906
907maas (0.1+bzr462+dfsg-0ubuntu1) precise; urgency=low
908
909 * New upstream release (LP: #980240)
910
911 [ Scott Moser ]
912 * add dependency on distro-info (LP: #949442)
913 * debian/control: add dependency on tgt for ephemeral iscsi environment
914
915 [ Andres Rodriguez ]
916 * Make package lintian clean:
917 - maas{-dhcp}.lintian-overrides: Add to make lintian clean.
918 - debian/control: Add missing dependencies; correct section and desc.
919 - debian/maas.postinst: Do not use absolute path for rabbitmqctl.
920 - debian/patches: Add headers to all patches.
921 * debian/maas-dhcp.postrm: Added to disable dnsmasq in cobbler on removal.
922 * debian/maas.config: Do not set a password with pwgen as it is not an
923 essential package; allow dbconfig-common to create a password instead by
924 creating an empty question. (LP: #977475)
925 * Run MAAS, pserv, txlongpoll as non-root user. (LP: #975436)
926 - debian/maas.postinst: Create user/group; set correct permissions for
927 directories.
928 - debian/maas.postrm: Remove user/group; restart apache2.
929 - debian/maas.maas-{pserv,txlongpoll}.upstart: Update to run as non-root
930 'maas' user.
931 * debian/patches/01-fix-database-settings.patch: Remove adding of PSERV_URL.
932 * debian/maas.postinst:
933 - Handle config file upgrade from versions lower than 0.1+bzr445+dfsg-0ubuntu1,
934 by creating new passwords and updating accordingly
935 - use local variables in functions.
936 - Handle maas tgt configuration for upgrades from 0.1+bzr459+dfsg-0ubuntu1.
937 * debian/extras/99-maas: Add squid-deb-proxy file to enable PPAs. (LP: #979383)
938 * debian/maas.install: Install missing commissioning-user-data script.
939
940 [ Dave Walker (Daviey) ]
941 * debian/patches/02-pserv-config.patch: Refreshed to apply to updated config.
942
943 [ Gavin Panella ]
944 * debian/maas.postinst: Update pserv.yaml and maas_local_settings.py to use
945 password.
946
947 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 12 Apr 2012 16:37:53 -0400
948
949maas (0.1+bzr415+dfsg-0ubuntu2) precise; urgency=low
950
951 * debian/maas-dhcp.{config,postinst}:
952 - Fix not setting new values on fresh install. (LP: #975321)
953 - Fix unsetting domain, otherwise, even if disabled, it will always be set.
954 * debian/control: Depends on maas for maas-dhcp.
955
956 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 06 Apr 2012 15:30:44 -0400
957
958maas (0.1+bzr415+dfsg-0ubuntu1) precise; urgency=low
959
960 * debian/control: Update package descriptions; Suggests maas-dhcp for maas
961 and add a maas-dhcp binary.
962 * Add maas-dhcp package to configure a DHCP server.
963 - debian/maas-dhcp.config: Add to ask debconf questions about range,
964 gateway, and domain.
965 - debian/maas-dhcp.postinst: Handle update of config values.
966 - debian/maas-dhcp.templates: Debconf questions.
967 * debian/po: Update for templates.
968 * Add message telling MAAS URL after installation.
969 - debian/maas.templates: Add message.
970 - debian/maas.postinst: Display message.
971 * debian/maas.config: Hide dbconfig-install question.
972
973 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 04 Apr 2012 14:47:13 -0400
974
975maas (0.1+bzr400+dfsg-0ubuntu1) precise; urgency=low
976
977 * debian/patches/{02-pserv-config,03-txlongpoll-config}.patch: Refreshed.
978 * debian/maas.install: Install maas-gc cronjob.
979 * Add apport hook.
980 - debian/maas.apport: Add hook.
981 - debian/rules: Install with apport.
982 * debian/maas.logrotate: Add logrotate for txlongpoll and pserv logs.
983 * Create 'var/lib/media/maas/storage' on postinst to have right permissions.
984 - debian/maas.dirs: Drop dir creation.
985 - debian/maas.postinst: Create dir with correct permissions.
986 - debian/maas.postrm: Remove dir on purge.
987
988 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Apr 2012 14:50:34 -0400
989
990maas (0.1+bzr378+dfsg-0ubuntu1) precise; urgency=low
991
992 * maas.dirs: Create var/lib/maas/media/storage for juju storage.
993 * maas.postinst:
994 - Give correct permissions to above dir.
995 - stop apache2 before db upgrade, and restart after.
996
997 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 29 Mar 2012 19:28:13 -0400
998
999maas (0.1+bzr363+dfsg-0ubuntu1) precise; urgency=low
1000
1001 [ Dave Walker (Daviey) ]
1002 * debian/control: Add openssh-server as a Recommends, and wrap-and-sort.
1003
1004 [ Andres Rodriguez ]
1005 * debian/maas.postinst:
1006 - Do not start apache with apache2ctl. Use invoke-rc.d instead to not
1007 fail in the installer.
1008 - For start of postgresql before creating the DB, otherwise it will
1009 fail in the installer.
1010 - Add check of invoke-rc.d for syslog.
1011 - Add check of invoke-rc.d for rabbitmq-server; Add check for rabbitmqctl
1012 - Add db_stop, in case invoke-rc.d fails.
1013 * debian/control: Tight python-django-maas dependency.
1014 * debian/postrm: Add check for rabbitmqctl.
1015 * debian/maas.maas-txlongpoll.upstart: Create rabbitmq longpoll user/vhost
1016 and set permissions if they don't exist. Start on rabbitmq-server-running.
1017
1018 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 27 Mar 2012 14:49:56 -0400
1019
1020maas (0.1+bzr338+dfsg-0ubuntu1) precise; urgency=low
1021
1022 [ Dave Walker (Daviey) ]
1023 * d/patches/03-txlongpoll-config.patch: Resolve typo error from prior patch.
1024 - LP: #961031
1025
1026 [ Andres Rodriguez ]
1027 * debian/maas.config: Don't allow reconfigure.
1028 * debian/maas.postinst: Don't allow reconfigure. Run sync/migrate db on
1029 all upgrades.
1030
1031 [ Scott Moser ]
1032 * add rsylog config for logging node boots (LP: 960149)
1033
1034 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 22 Mar 2012 10:56:58 -0400
1035
1036maas (0.1+bzr315+dfsg-0ubuntu1) precise; urgency=low
1037
1038 * New upstream snapshot.
1039
1040 [ Dave Walker ]
1041 * debian/maas.postinst: Do not import ISO's at install time.
1042 * debian/control:
1043 - Drop run-one, it's not a requirement and currently in universe.
1044 - Drop python-setproctitle, no longer required.
1045
1046 [ Andres Rodriguez ]
1047 * debian/control: Depends on python-avahi, python-dbus, and avahi-daemon.
1048 * debian/maas.postinst:
1049 - Only syncdb if dbconfig db creation was selected.
1050 - Set rabbitmq/longpoll settings
1051 * debian/patches/03-txlongpoll-config.patch: Updated broker settings for
1052 rabbitmq.
1053
1054 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 20 Mar 2012 20:10:58 -0400
1055
1056maas (0.1+bzr300+dfsg-0ubuntu1) precise; urgency=low
1057
1058 * debian/patches:
1059 - 01-fix-database-settings.patch: Update PSERV_URL port.
1060 - 02-pserv-config.patch: Update, and set 'maas' as username.
1061 - 03-longpoll-config.patch: Update.
1062 * debian/maas.install: Install preseeds and snippets.
1063 * debian/maas.postinst:
1064 - Set password for 'maas' cobbler username (in pserv and cobbler).
1065 - Set DEFAULT_MAAS_URL to IP of interface with default gateway.
1066
1067 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 16 Mar 2012 14:59:16 -0400
1068
1069maas (0.1+bzr295+dfsg-0ubuntu2) precise; urgency=low
1070
1071 * debian/patches:
1072 - 01-fix-database-settings.patch: Update to set PSERV_URL.
1073 - 02-pserv-config.patch: Set port to 8001.
1074 * debian/maas.postinst: Run maas-import-isos on install.
1075 * debian/control: Depends on rabbitmq-server.
1076
1077 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Mar 2012 18:14:08 -0400
1078
1079maas (0.1+bzr295+dfsg-0ubuntu1) precise; urgency=low
1080
1081 * debian/maas.upstart: Specify pidfile and conffile.
1082 * debian/maas.postinst:
1083 - Only run syncdb if dbconfig postinst file exists.
1084 - Fix file permissions.
1085 * debian/maas.{postrm,prerm}: Add dbconfig-common support.
1086 * Add txlongpoll support for packaging:
1087 - debian/control: Depends on python-txlongpoll.
1088 - debian/maas.maas-longpoll.upstart: Added to start txlongpoll.
1089 - debian/maas.install: Install txlongpoll.yaml
1090 * debian/extras/maas: Improvements.
1091 * debian/maas.maas.upstart: Moved from debian/maas.upstart.
1092 * debian/maas.postinst: Touch logfile to set correct permissions (LP: #955400)
1093 * debian/maas.logrotate: Add.
1094 * debian/patches/03-txlongpoll-config.patch: Add default settings.
1095 * debian/maas.config: Only run dbconfig-common on configure/reconfigure.
1096 * Install maas_local_settings.py in /etc/maas and symlink to usr/share/maas
1097 * Update references from MaaS to MAAS.
1098 * Remove podebconf as templates no longer exist.
1099 - debian/po: Remove.
1100 - debian/control: Drop Build-Depends on po-debconf
1101
1102 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Mar 2012 15:28:14 -0400
1103
1104maas (0.1+bzr266+dfsg-0ubuntu1) precise; urgency=low
1105
1106 * Remove support for squid3 and use squid-deb-proxy instead.
1107 * debian/extras/maas: Add to handle syncdb and creation of admin user.
1108 * Add debconf questions to ask for user/pass:
1109 - debian/maas.{template,config}: Add
1110 - debian/maas.postinst: Ask debconf questions.
1111 - debian/po: Add translation templates.i
1112 * debian/maas.postinst: Enable wsgi module; drop squid3 steps.
1113 * debian/maas.postrm: removed.
1114 * debian/patches/01-fix-database-settings.patch: Custom database settings
1115 and static files path.
1116 * debian/{rules,maas.install}: Install maas static files in
1117 'usr/share/maas/web/static'.
1118 * Integrate cobbler:
1119 - debian/maas.install: Install pserv twisted plugin, and config.
1120 - debian/maas.upstart: Created to start plugin daemon.
1121 - debian/patches/02-pserv-config.patch: Custom pserv config.
1122 * Integrate dbconfig-common:
1123 - debian/maas.config: Added and default user/pass and database.
1124 - debian/maas.{postinst,postrm}: Added handling for dbconfig-common
1125 * debian/control: Depends on python-convoy.
1126 * debian/rules: Update path to removal of dsfg files.
1127 * debian/patches/01-fix-database-settings.patch: Updated.
1128
1129 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 13 Mar 2012 14:31:50 -0400
1130
1131maas (0.1+bzr232+dfsg-0ubuntu1) precise; urgency=low
1132
1133 * New upstream snapshot.
1134
1135 [ Dave Walker ]
1136 * debian/control:
1137 - Changed depends from psycopg2 to python-psycopg2 and dropped versioning.
1138 - LP: #937982
1139
1140 [ Andres Rodriguez ]
1141 * debian/maas.install: Install maas-import-isos and related files.
1142 * Integrate squid3 as proxy solution:
1143 - debian/extras/squid.conf: Added
1144 - debian/control: Depend on squid3.
1145 - debian/maas.{postinst,postrm}: Handle installation/removal of custom
1146 squid config file.
1147 * Split into different binary packages (maas,python-django-maas).
1148 - debian/maas.postinst: Handle the apache2 configuration.
1149
1150 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 07 Mar 2012 12:46:17 -0500
1151
1152maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low
1153
1154 * New upstream snapshot, post 0.1 release.
1155 * debian/control:
1156 - Drop depends on rabbitmq-server, no longer required.
1157 * debian/watch: Introduced watch file.
1158
1159 -- Dave Walker (Daviey) <DaveWalker@ubuntu.com> Thu, 23 Feb 2012 13:08:12 +0000
1160
1161maas (0.1~bzr146+dfsg-0ubuntu1) precise; urgency=low
1162
1163 * Initial release
1164
1165 -- Julian Edwards <julian.edwards@canonical.com> Thu, 16 Jan 2012 15:29:07 +0000
01166
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
17
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2014-07-15 21:22:45 +0000
@@ -0,0 +1,232 @@
1Source: maas
2Section: net
3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: debhelper (>= 8.1.0~),
6 dh-apport,
7 po-debconf,
8 python (>= 2.7),
9 python-distribute,
10 python-django
11Standards-Version: 3.9.4
12X-Python-Version: >= 2.7
13Homepage: https://launchpad.net/maas
14
15Package: maas
16Architecture: all
17Depends: ${misc:Depends}, maas-cluster-controller, maas-region-controller, python-django-maas
18Description: MAAS server all-in-one metapackage
19 MAAS is "Metal As A Service", a system for dynamic provisioning of physical
20 servers that has many of the same characteristics as a cloud. You register
21 servers with MAAS by telling MAAS about their IPMI or other control system.
22 MAAS can then do hardware inventory, and provision that system on demand
23 with whatever OS and software you like. MAAS is standalone software that
24 works with any configuration system, but for best results combine MAAS with
25 Juju.
26 .
27 MAAS provides:
28 * Hardware inventory of servers
29 * Dynamic provisioning based on name or attributes such as disk, RAM cores, sockets
30 * DNS and DHCP as needed
31 * PXE boot services
32 .
33 This package is a metapackage which installs all of the separate components
34 of MAAS on a single machine.
35
36Package: maas-common
37Architecture: all
38Depends: ${misc:Depends}, ${python:Depends}
39Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
40Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
41Description: MAAS server common files
42 This package contains the common files for any MAAS installation.
43
44Package: maas-region-controller-min
45Architecture: all
46Depends: apache2,
47 bind9utils,
48 dbconfig-common,
49 iproute,
50 libapache2-mod-wsgi,
51 libjs-raphael,
52 libjs-yui3-full,
53 libjs-yui3-min,
54 maas-common (= ${binary:Version}),
55 pwgen,
56 python-django (>= 1.4),
57 python-django-maas (= ${binary:Version}),
58 python-django-piston,
59 python-django-south,
60 python-maas-provisioningserver (= ${binary:Version}),
61 python-djorm-ext-pgarray,
62 rsyslog,
63 squid-deb-proxy,
64 ${misc:Depends},
65 ${python:Depends}
66Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
67Replaces: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
68Description: MAAS Server minimum region controller
69 This package installs and configures the minimum region controller
70 services provided by MAAS, including the web UI, caching package proxy,
71 networking/traffic control, and remote logging system.
72
73Package: maas-region-controller
74Architecture: all
75Depends: maas-region-controller-min (= ${binary:Version}),
76 postgresql (>= 9.1),
77 rabbitmq-server,
78 ${misc:Depends},
79 ${python:Depends}
80Recommends: openssh-server, maas-dns (= ${binary:Version})
81Description: MAAS server complete region controller
82 This package installs and configures the complete MAAS region controller,
83 including the minimum setup, plus the database server and messaging queue.
84
85Package: python-maas-provisioningserver
86Section: python
87Architecture: all
88Depends: python-amqp,
89 python-celery,
90 python-distro-info,
91 python-formencode,
92 python-jsonschema,
93 python-lockfile,
94 python-lxml,
95 python-maas-client,
96 python-netifaces,
97 python-oops,
98 python-oops-amqp,
99 python-oops-datedir-repo,
100 python-oops-twisted,
101 python-pyparsing,
102 python-seamicroclient,
103 python-simplestreams,
104 python-tempita,
105 python-twisted-core,
106 python-twisted-web,
107 python-txamqp,
108 python-txtftp,
109 python-yaml,
110 python-zope.interface,
111 ${misc:Depends},
112 ${python:Depends}
113Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1)
114Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1)
115Conflicts: python-librabbitmq
116Description: MAAS server provisioning libraries
117 This package provides the MAAS provisioning server python libraries.
118
119Package: maas-cli
120Architecture: all
121Depends: python-bzrlib,
122 python-httplib2,
123 python-maas-client (= ${binary:Version}),
124 python-oauth,
125 ${misc:Depends},
126 ${python:Depends}
127Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
128Replaces: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
129Description: MAAS command line API tool
130 This package contains the MAAS client command line API tool.
131 This tool enables automation of tasks in MAAS, remotely, through
132 its API.
133
134Package: python-maas-client
135Section: python
136Architecture: all
137Depends: python-oauth, ${misc:Depends}, ${python:Depends}
138Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
139Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
140Description: MAAS python API client
141 This package contains the MAAS client API Python modules.
142
143Package: maas-cluster-controller
144Architecture: all
145Depends: apache2,
146 authbind,
147 bind9utils,
148 distro-info,
149 freeipmi-tools,
150 grub-common,
151 maas-cli (=${binary:Version}),
152 maas-common (=${binary:Version}),
153 maas-dhcp (=${binary:Version}),
154 python-amqp,
155 python-celery,
156 python-httplib2,
157 python-lockfile,
158 python-maas-provisioningserver (=${binary:Version}),
159 python-netaddr,
160 python-oauth,
161 python-pexpect,
162 python-tempita,
163 python-twisted,
164 python-zope.interface,
165 rsyslog,
166 syslinux-common,
167 tgt,
168 ubuntu-cloudimage-keyring,
169 uuid-runtime,
170 wget,
171 ${misc:Depends},
172 ${python:Depends}
173Suggests: ipmitool, libvirt-bin, amtterm
174Conflicts: tftpd-hpa, python-librabbitmq
175Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
176Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
177Description: MAAS server cluster controller
178 This package contains the MAAS cluster controller, which is responsible
179 for enabling and controlling remote DHCP/TFTP instances on their own
180 subnets.
181
182Package: python-django-maas
183Section: python
184Architecture: all
185Depends: python-amqp,
186 python-celery,
187 python-convoy,
188 python-crochet,
189 python-curtin,
190 python-lockfile,
191 python-lxml,
192 python-maas-client (= ${binary:Version}),
193 python-netaddr,
194 python-oops,
195 python-oops-amqp,
196 python-oops-datedir-repo,
197 python-oops-twisted,
198 python-oops-wsgi,
199 python-psycopg2,
200 python-sphinx,
201 python-tempita,
202 python-twisted,
203 python-txamqp,
204 python-txlongpoll,
205 python-zope.interface,
206 ${misc:Depends},
207 ${python:Depends}
208Conflicts: python-librabbitmq
209Description: MAAS server Django web framework
210 This package provides the Django web framework for MAAS.
211
212Package: maas-dhcp
213Architecture: all
214Depends: isc-dhcp-server (>= 4.2.4), ${misc:Depends}
215Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
216Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
217Description: MAAS DHCP server
218 This package installs and configures a DHCP server that can be used by
219 MAAS, and enhances the overall MAAS user experience.
220
221Package: maas-dns
222Architecture: all
223Depends: bind9,
224 maas-region-controller-min (= ${binary:Version}),
225 python-iscpy,
226 ${misc:Depends}
227Conflicts: dnsmasq
228Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
229Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
230Description: MAAS DNS server
231 This package installs and configures a DNS server that can be used by
232 MAAS, and enhances the overall MAAS user experience.
0233
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2014-07-15 21:22:45 +0000
@@ -0,0 +1,25 @@
1Format: http://dep.debian.net/deps/dep5
2Upstream-Name: maas
3Source: https://launchpad.net/maas
4
5Files: *
6Copyright: 2012 Canonical Ltd.
7License: AGPL-3.0+
8
9Files: debian/*
10Copyright: 2012 Canonical Ltd.
11License: AGPL-3.0+
12
13License: AGPL-3.0+
14 This program is free software: you can redistribute it and/or modify
15 it under the terms of the GNU Affero General Public License as
16 published by the Free Software Foundation, either version 3 of the
17 License, or (at your option) any later version.
18 .
19 This program is distributed in the hope that it will be useful,
20 but WITHOUT ANY WARRANTY; without even the implied warranty of
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22 GNU Affero General Public License for more details.
23 .
24 You should have received a copy of the GNU Affero General Public License
25 along with this program. If not, see <http://www.gnu.org/licenses/>.
026
=== added directory 'debian/extras'
=== added file 'debian/extras/20-maas.conf'
--- debian/extras/20-maas.conf 1970-01-01 00:00:00 +0000
+++ debian/extras/20-maas.conf 2014-07-15 21:22:45 +0000
@@ -0,0 +1,32 @@
1# Enable the udp server for installation logging
2$ModLoad imudp
3$UDPServerRun 514
4$ModLoad imtcp # load TCP listener
5
6# The following section (certificates) was copied from orchestra, but is
7# not used here. In the future, if we needed secure ssl, then re-enable.
8# These files were created in the orchestra-logging-server's postinst
9#
10## make gtls driver the default
11#$DefaultNetstreamDriver gtls
12#
13## certificate files
14#$DefaultNetstreamDriverCAFile /var/lib/maas/ssl-cert-orchestra-ca.pem
15#$DefaultNetstreamDriverCertFile /var/lib/maas/.ssl/ssl-cert-orchestra.pem
16#$DefaultNetstreamDriverKeyFile /var/lib/maas/.ssl/ssl-cert-orchestra-pk.pem
17#
18#$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode
19#$InputTCPServerStreamDriverAuthMode anon # client is NOT authenticated
20#$InputTCPServerRun 10514 # start up listener at port 10514
21
22# Reduce message repetition
23$RepeatedMsgReduction on
24##$RepeatedMsgContainsOrigionalMsg on
25
26# Message templating
27$template MAASboot,"/var/log/maas/rsyslog/%HOSTNAME%/%$YEAR%/%$MONTH%/%$DAY%/messages"
28
29:fromhost-ip, !isequal, "127.0.0.1" ?MAASboot
30# Stop messages that came from anywhere else from going into other places
31# like /var/log/syslog. If you want to see these messages there, then comment below
32& ~
033
=== added file 'debian/extras/99-maas'
--- debian/extras/99-maas 1970-01-01 00:00:00 +0000
+++ debian/extras/99-maas 2014-07-15 21:22:45 +0000
@@ -0,0 +1,5 @@
1# /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
2#
3# Enable launchpad personal package archives for squid-deb-proxy
4ppa.launchpad.net
5keyserver.ubuntu.com
06
=== added file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers 1970-01-01 00:00:00 +0000
+++ debian/extras/99-maas-sudoers 2014-07-15 21:22:45 +0000
@@ -0,0 +1,4 @@
1maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart
2maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server stop
3maas ALL= NOPASSWD: /usr/sbin/maas-provision
4maas ALL= NOPASSWD: SETENV: /usr/sbin/maas-import-pxe-files
05
=== added file 'debian/extras/isc-dhcp-server.override'
--- debian/extras/isc-dhcp-server.override 1970-01-01 00:00:00 +0000
+++ debian/extras/isc-dhcp-server.override 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
1manual
02
=== added file 'debian/extras/maas'
--- debian/extras/maas 1970-01-01 00:00:00 +0000
+++ debian/extras/maas 2014-07-15 21:22:45 +0000
@@ -0,0 +1,6 @@
1#!/bin/sh
2if [ "`expr \"$0\" : \".*maas-cli*\"`" != "0" ];then
3 echo " WARNING: The maas-cli command is deprecated and will be removed" \
4 "in a future\n version. From now on please use 'maas' instead." >&2
5fi
6exec python -m maascli "$@"
07
=== added file 'debian/extras/maas-probe-dhcp'
--- debian/extras/maas-probe-dhcp 1970-01-01 00:00:00 +0000
+++ debian/extras/maas-probe-dhcp 2014-07-15 21:22:45 +0000
@@ -0,0 +1,7 @@
1#!/bin/sh
2if [ "$(id -u)" != "0" ]; then
3 echo "This utility may only be run as root." 1>&2
4 exit 1
5fi
6export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}"
7exec /usr/bin/python -m provisioningserver.dhcp.probe "$@"
08
=== added file 'debian/extras/maas-provision'
--- debian/extras/maas-provision 1970-01-01 00:00:00 +0000
+++ debian/extras/maas-provision 2014-07-15 21:22:45 +0000
@@ -0,0 +1,7 @@
1#!/bin/sh
2if [ "$(id -u)" != "0" ]; then
3 echo "This utility may only be run as root." 1>&2
4 exit 1
5fi
6export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}"
7exec /usr/bin/python -m provisioningserver "$@"
08
=== added file 'debian/extras/maas-region-admin'
--- debian/extras/maas-region-admin 1970-01-01 00:00:00 +0000
+++ debian/extras/maas-region-admin 2014-07-15 21:22:45 +0000
@@ -0,0 +1,8 @@
1#!/bin/sh
2if [ "$(id -u)" != "0" ]; then
3 echo "This utility may only be run as root." 1>&2
4 exit 1
5fi
6export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}"
7export DJANGO_SETTINGS_MODULE="maas.settings"
8exec /usr/bin/django-admin "$@"
09
=== added file 'debian/extras/maas-region-celeryd'
--- debian/extras/maas-region-celeryd 1970-01-01 00:00:00 +0000
+++ debian/extras/maas-region-celeryd 2014-07-15 21:22:45 +0000
@@ -0,0 +1,50 @@
1#!/usr/bin/python
2import os
3from grp import getgrnam
4from pwd import getpwnam
5
6def start_celery(args):
7 uid = getpwnam(args.user).pw_uid
8 gid = getgrnam(args.group).gr_gid
9
10 env = dict(os.environ, PYTHONPATH="/usr/share/maas")
11
12 command = [
13 'celeryd',
14 '--logfile=%s' % args.logfile,
15 '--schedule=%s' % args.schedule,
16 '--loglevel=INFO',
17 '--beat',
18 '--queues=celery,master',
19 ]
20
21 # Change gid first, just in case changing the uid might deprive
22 # us of the privileges required to setgid.
23 os.setgid(gid)
24 os.setuid(uid)
25
26 os.execvpe(command[0], command, env=env)
27
28def main():
29 import argparse
30 parser = argparse.ArgumentParser(
31 description='MAAS celery daemon config options')
32 parser.add_argument(
33 '--user', '-u', metavar='USER', default='maas',
34 help="System user identity that should run the cluster controller.")
35 parser.add_argument(
36 '--group', '-g', metavar='GROUP', default='maas',
37 help="System group that should run the cluster controller.")
38 parser.add_argument(
39 '--logfile', '-l', metavar='LOGFILE', default='/var/log/maas/celery-region.log',
40 help="Location of the logfile.")
41 parser.add_argument(
42 '--schedule', '-s', metavar='SCHEDULE', default='/var/lib/maas/celerybeat-region-schedule',
43 help="Location of the beat schedule file.")
44
45 args = args = parser.parse_args()
46
47 start_celery(args)
48
49if __name__ == '__main__':
50 main()
051
=== added file 'debian/extras/maas_remote_syslog_compress'
--- debian/extras/maas_remote_syslog_compress 1970-01-01 00:00:00 +0000
+++ debian/extras/maas_remote_syslog_compress 2014-07-15 21:22:45 +0000
@@ -0,0 +1,2 @@
1# Compress log files not changed in more than 48 hours:
230 4 * * * root find /var/log/maas/rsyslog -type f -mtime +2 -exec bzip2 '{}' \;
03
=== added file 'debian/maas-cli.install'
--- debian/maas-cli.install 1970-01-01 00:00:00 +0000
+++ debian/maas-cli.install 2014-07-15 21:22:45 +0000
@@ -0,0 +1,2 @@
1debian/extras/maas usr/bin
2debian/tmp/usr/lib/python*/dist-packages/maascli
03
=== added file 'debian/maas-cli.links'
--- debian/maas-cli.links 1970-01-01 00:00:00 +0000
+++ debian/maas-cli.links 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
1usr/bin/maas usr/bin/maas-cli
02
=== added file 'debian/maas-cli.lintian-overrides'
--- debian/maas-cli.lintian-overrides 1970-01-01 00:00:00 +0000
+++ debian/maas-cli.lintian-overrides 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
1maas-cli: binary-without-manpage usr/bin/maas-cli
02
=== added file 'debian/maas-cluster-controller.config'
--- debian/maas-cluster-controller.config 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.config 2014-07-15 21:22:45 +0000
@@ -0,0 +1,36 @@
1#!/bin/sh
2
3set -e
4
5. /usr/share/debconf/confmodule
6db_version 2.0
7
8# Only ask for new installations and reconfiguring.
9# XXX Fix to not ask when installing from the CD.
10if ([ "$1" = "configure" ] && [ -z "$2" ]); then
11
12 db_get maas-cluster-controller/maas-url || true
13 if [ -z "$RET" ]; then
14 # Attempt to pre-populate if installing on the region controller.
15 if [ -e /etc/maas/maas_local_settings.py ]; then
16 url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py)
17 # If the URL doesn't end in /MAAS then add it. This helps upgrades from
18 # precise for which the URL didn't contain /MAAS, which is now required
19 if ! echo $url | grep -qs "/MAAS$"; then
20 url="${url}/MAAS"
21 fi
22 db_set maas-cluster-controller/maas-url "$url"
23 else
24 # Will only get here if dbconf value not already set, or
25 # /etc/maas/maas_local_settings.py doesn't exist.
26 db_input medium maas-cluster-controller/maas-url || true
27 db_go
28 fi
29 fi
30fi
31
32if [ "$1" = "reconfigure" ]; then
33 db_input high maas-cluster-controller/maas-url || true
34 db_go
35fi
36#DEBHELPER#
037
=== added file 'debian/maas-cluster-controller.dirs'
--- debian/maas-cluster-controller.dirs 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.dirs 2014-07-15 21:22:45 +0000
@@ -0,0 +1,2 @@
1etc/maas
2var/lib/maas/boot-resources
03
=== added file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.install 2014-07-15 21:22:45 +0000
@@ -0,0 +1,31 @@
1# Install twisted plugins
2twisted/plugins/maasps.py usr/share/pyshared/twisted/plugins
3
4# Install PSERV config files
5debian/tmp/etc/maas/pserv.yaml
6debian/tmp/etc/maas/bootresources.yaml
7
8# Install cluster config file
9debian/tmp/etc/maas/maas_cluster.conf
10
11# Install celery config file
12debian/tmp/usr/share/maas/celeryconfig_cluster.py
13
14# Install local celery cluster config file
15debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py
16
17# Install templates
18debian/tmp/etc/maas/templates/dhcp
19debian/tmp/etc/maas/templates/power
20debian/tmp/etc/maas/templates/pxe
21debian/tmp/etc/maas/templates/uefi
22
23# Install maas-import-pxe-files and related files
24debian/tmp/usr/sbin/maas-import-pxe-files
25man/maas-import-pxe-files.8 usr/share/man/man8
26debian/tmp/usr/bin/uec2roottar
27
28# Install all other stuff
29debian/extras/99-maas-sudoers etc/sudoers.d
30debian/extras/isc-dhcp-server.override etc/init
31debian/tmp/etc/maas/maas-cluster-http.conf
032
=== added file 'debian/maas-cluster-controller.links'
--- debian/maas-cluster-controller.links 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.links 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
1etc/maas/maas_local_celeryconfig_cluster.py usr/share/maas/maas_local_celeryconfig_cluster.py
02
=== added file 'debian/maas-cluster-controller.lintian-overrides'
--- debian/maas-cluster-controller.lintian-overrides 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.lintian-overrides 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
1maas-cluster-controller: binary-without-manpage usr/bin/uec2roottar
02
=== added file 'debian/maas-cluster-controller.logrotate'
--- debian/maas-cluster-controller.logrotate 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.logrotate 2014-07-15 21:22:45 +0000
@@ -0,0 +1,9 @@
1/var/log/maas/pserv.log {
2 rotate 5
3 weekly
4 compress
5 missingok
6 postrotate
7 [ -r /var/run/maas-pserv.pid ] && kill -s USR2 $(cat /var/run/maas-pserv.pid) || true
8 endscript
9}
010
=== added file 'debian/maas-cluster-controller.maas-cluster-celery.upstart'
--- debian/maas-cluster-controller.maas-cluster-celery.upstart 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.maas-cluster-celery.upstart 2014-07-15 21:22:45 +0000
@@ -0,0 +1,30 @@
1# maas-cluster-controller - provisioning service
2#
3# MAAS Cluster Controller Service
4
5description "MAAS Cluster Controller"
6author "Julian Edwards <julian.edwards@canonical.com>"
7
8start on filesystem and net-device-up
9stop on runlevel [016]
10
11env CONFIG_FILE=/etc/maas/maas_cluster.conf
12# Use cluster config.
13env CELERY_CONFIG_MODULE="celeryconfig_cluster"
14
15pre-start script
16 if [ ! -f $CONFIG_FILE ]; then
17 echo "$CONFIG_FILE does not exist. Aborting."
18 stop
19 exit 0
20 fi
21end script
22
23script
24 # Prepare settings.
25 . $CONFIG_FILE
26 # Allow the cluster-controller process to read CLUSTER_UUID as set
27 # in that config file.
28 export CLUSTER_UUID
29 exec /usr/bin/authbind --deep /usr/sbin/maas-provision start-cluster-controller $MAAS_URL -u maas -g maas
30end script
031
=== added file 'debian/maas-cluster-controller.maas-pserv.upstart'
--- debian/maas-cluster-controller.maas-pserv.upstart 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.maas-pserv.upstart 2014-07-15 21:22:45 +0000
@@ -0,0 +1,32 @@
1# maas-pserv - provisioning service
2#
3# MAAS Provisioning Service
4
5description "MAAS"
6author "Andres Rodriguez <andres.rodriguez@canonical.com>"
7
8start on filesystem and net-device-up
9stop on runlevel [016]
10
11respawn
12
13env CONFIG_FILE=/etc/maas/maas_cluster.conf
14
15pre-start script
16 if [ ! -f $CONFIG_FILE ]; then
17 echo "$CONFIG_FILE does not exist. Aborting."
18 stop
19 exit 0
20 fi
21end script
22
23script
24 # Prepare settings.
25 . $CONFIG_FILE
26 # Allow the tftpd process to read CLUSTER_UUID as set in that config
27 # file.
28 export CLUSTER_UUID
29 export MAAS_URL
30 # To add options to your daemon, edit the line below:
31 exec /usr/bin/authbind --deep /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-pserv.pid --logfile=/dev/null maas-pserv --config-file=/etc/maas/pserv.yaml
32end script
033
=== added file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.postinst 2014-07-15 21:22:45 +0000
@@ -0,0 +1,166 @@
1#!/bin/sh
2
3set -e
4
5. /usr/share/debconf/confmodule
6db_version 2.0
7
8RELEASE=`lsb_release -rs` || RELEASE=""
9
10create_log_dir() {
11 # create log dir
12 if [ ! -d /var/lib/maas ]; then
13 mkdir -p /var/lib/maas
14 fi
15 if [ ! -d /var/log/maas/oops ]; then
16 mkdir -p /var/log/maas/oops
17 fi
18 # Give appropriate permissions
19 chown -R maas:maas /var/lib/maas/
20 chown -R maas:maas /var/log/maas
21 chmod -R 775 /var/log/maas/oops
22}
23
24configure_maas_tgt() {
25 # Ensure that iSCSI targets get re-defined on reboot.
26 # Creates a softlink in /etc/tgt/conf.d/ that points to the current
27 # boot images' tgt configuration.
28 mkdir -p /etc/tgt/conf.d
29 ln -sf /var/lib/maas/boot-resources/current/maas.tgt /etc/tgt/conf.d/maas.conf
30}
31
32extract_cluster_uuid(){
33 # Extract ClUSTER_UUID setting from config file $1. This will work
34 # both the cluster celery config (which is python) and the cluster
35 # config (which is shell).
36 sed -n -e "s/^CLUSTER_UUID *= *[\"']\([^\"']*\).*/\1/p" "$1"
37}
38
39configure_cluster_uuid(){
40 # The cluster uuid goes into maas_cluster.conf, but we also still
41 # keep a copy in maas_local_celeryconfig_cluster.py (hopefully just
42 # temporarily). If an old uuid is configured, we replicate that to
43 # maas_cluster.conf; otherwise, we want to generate one.
44 local uuid
45
46
47 if [ -n "$(extract_cluster_uuid /etc/maas/maas_cluster.conf)" ]; then
48 # UUID is already set up. Wonderful.
49 return
50 fi
51
52 # Look for a UUID stored in the old location.
53 uuid="$(extract_cluster_uuid /etc/maas/maas_local_celeryconfig_cluster.py)"
54
55 if [ -z "$uuid" ]; then
56 # No UUID at all yet. Generate one, and insert it into its
57 # placeholder in the old config location.
58 uuid="$(uuidgen)"
59 sed -i "s|^CLUSTER_UUID = None$|CLUSTER_UUID = '$uuid'|" \
60 /etc/maas/maas_local_celeryconfig_cluster.py
61 fi
62
63 # Either way, at this point we have a uuid, and it is configured in
64 # the old config location.
65 #
66 # Write it to maas_cluster.conf as well. There is no initial
67 # placeholder in this file, so just append the setting.
68 echo "CLUSTER_UUID=\"$uuid\"" >>/etc/maas/maas_cluster.conf
69}
70
71enable_apache_version_mod(){
72 COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
73 if [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
74 a2enmod version
75 fi
76}
77
78configure_cluster_http(){
79 case $RELEASE in
80 12.04|12.10|13.04)
81 if [ -e /etc/maas/maas-cluster-http.conf -a \
82 ! -e /etc/apache2/conf.d/maas-cluster-http.conf ]; then
83 ln -sf /etc/maas/maas-cluster-http.conf /etc/apache2/conf.d/maas-cluster-http.conf
84 fi
85 ;;
86 *)
87 # handle apache configs
88 if [ -e /etc/maas/maas-cluster-http.conf -a \
89 ! -e /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
90 ln -sf /etc/maas/maas-cluster-http.conf /etc/apache2/conf-enabled/maas-cluster-http.conf
91 fi
92 ;;
93 esac
94}
95
96configure_cluster_authbind() {
97 MAAS_UID="`id -u maas`"
98 if [ ! -f "/etc/authbind/byuid/$MAAS_UID" ]; then
99 if [ ! -d "/etc/authbind/byuid" ]; then
100 mkdir -p /etc/authbind/byuid
101 chmod 755 /etc/authbind
102 chmod 755 /etc/authbind/byuid
103 fi
104 fi
105 echo '0.0.0.0/0:68,69' >/etc/authbind/byuid/$MAAS_UID
106 echo '::/0,68-69' >>/etc/authbind/byuid/$MAAS_UID
107 chown maas:maas /etc/authbind/byuid/$MAAS_UID
108 chmod 700 /etc/authbind/byuid/$MAAS_UID
109}
110
111restart_apache2(){
112 if [ -x /usr/sbin/invoke-rc.d ]; then
113 invoke-rc.d apache2 restart || true
114 else
115 /etc/init.d/apache2 restart || true
116 fi
117}
118
119configure_pserv_generator(){
120 # Get the MAAS_URL on configure/reconfigure and write it to the conf files.
121 db_get maas-cluster-controller/maas-url || true
122 if [ -n "$RET" ]; then
123 sed -i "s|MAAS_URL=.*|MAAS_URL=\"$RET\"|" /etc/maas/maas_cluster.conf
124 # Extract the hostname part.
125 HOSTPART=$(echo $RET|awk '{ split($0,array,"/")} END{print array[3] }')
126 # And substitute it in-place in pserv.yaml on an indented, non-commented
127 # line.
128 sed -ri "s|^([[:space:]]+)(#+[[:space:]]*)?(generator:[[:space:]]+https?://)[^:/]+|\1\3$HOSTPART|" /etc/maas/pserv.yaml
129 fi
130}
131
132
133
134if [ "$1" = "configure" ] && [ -z "$2" ]; then
135 create_log_dir
136 configure_maas_tgt
137fi
138
139if [ "$1" = "configure" ]; then
140 if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then
141 create_log_dir
142 fi
143
144 configure_maas_tgt
145 configure_pserv_generator
146
147 # These config files may contain a private cluster UUID. Only maas
148 # can read them; only root can write them
149 chown root:maas \
150 /etc/maas/maas_local_celeryconfig_cluster.py \
151 /etc/maas/maas_cluster.conf
152 chmod 0640 \
153 /etc/maas/maas_local_celeryconfig_cluster.py \
154 /etc/maas/maas_cluster.conf
155
156 configure_cluster_uuid
157 configure_cluster_authbind
158 enable_apache_version_mod
159 configure_cluster_http
160 restart_apache2
161 maas-provision upgrade-cluster
162fi
163
164db_stop
165
166#DEBHELPER#
0167
=== added file 'debian/maas-cluster-controller.postrm'
--- debian/maas-cluster-controller.postrm 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.postrm 2014-07-15 21:22:45 +0000
@@ -0,0 +1,43 @@
1#!/bin/sh
2
3set -e
4
5#DEBHELPER#
6
7RELEASE=`lsb_release -rs` || RELEASE=""
8
9case "$1" in
10 purge)
11 # remove log directory
12 rm -rf /var/log/maas
13 case $RELEASE in
14 12.04|12.10|13.04)
15 if [ -h /etc/apache2/conf.d/maas-cluster-http.conf ]; then
16 rm -rf /etc/apache2/conf.d/maas-cluster-http.conf
17 fi
18 ;;
19 *)
20 # remove apache2 config
21 if [ -h /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
22 rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf
23 fi
24 ;;
25 esac
26 # remove var directory
27 rm -rf /var/lib/maas/celerybeat-cluster-schedule
28 DIR=/var/lib/maas
29 if [ "$(ls -A $DIR 2> /dev/null)" = "" ]; then
30 rm -rf /var/lib/maas
31 fi
32
33 # Delete symlink for iSCSI config.
34 if [ -L /etc/tgt/conf.d/maas.conf ]; then
35 rm -rf /etc/tgt/conf.d/maas.conf
36 fi
37
38 # Remove authbind
39 MAAS_UID="`id -u maas`"
40 if [ -f "/etc/authbind/byuid/$MAAS_UID" ]; then
41 rm -rf /etc/authbind/byuid/$MAAS_UID
42 fi
43esac
044
=== added file 'debian/maas-cluster-controller.templates'
--- debian/maas-cluster-controller.templates 1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.templates 2014-07-15 21:22:45 +0000
@@ -0,0 +1,7 @@
1Template: maas-cluster-controller/maas-url
2Type: string
3Default:
4_Description: Ubuntu MAAS API address:
5 The MAAS Cluster Controller needs to contact the MAAS server to
6 register its presence. Set the URL to the MAAS API here, e.g.
7 http://192.168.1.1/MAAS
08
=== added file 'debian/maas-common.install'
--- debian/maas-common.install 1970-01-01 00:00:00 +0000
+++ debian/maas-common.install 2014-07-15 21:22:45 +0000
@@ -0,0 +1,2 @@
1# Install Celery Config
2debian/tmp/usr/share/maas/celeryconfig_common.py
03
=== added file 'debian/maas-common.postinst'
--- debian/maas-common.postinst 1970-01-01 00:00:00 +0000
+++ debian/maas-common.postinst 2014-07-15 21:22:45 +0000
@@ -0,0 +1,14 @@
1#!/bin/sh
2
3set -e
4
5add_user_group(){
6 local user="maas"
7 local group="maas"
8 addgroup --quiet --system "$group" || true
9 adduser --quiet --system --group --no-create-home "$user" || true
10}
11
12add_user_group
13
14#DEBHELPER#
015
=== added file 'debian/maas-common.postrm'
--- debian/maas-common.postrm 1970-01-01 00:00:00 +0000
+++ debian/maas-common.postrm 2014-07-15 21:22:45 +0000
@@ -0,0 +1,14 @@
1#!/bin/sh
2
3set -e
4
5case "$1" in
6 purge)
7 # Deleting user/group
8 if getent passwd maas >/dev/null; then
9 deluser maas || true
10 delgroup maas || true
11 fi
12esac
13
14#DEBHELPER#
015
=== added file 'debian/maas-dhcp.apparmor'
--- debian/maas-dhcp.apparmor 1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.apparmor 2014-07-15 21:22:45 +0000
@@ -0,0 +1,7 @@
1/run/maas/dhcp/ r,
2/run/maas/dhcp/** r,
3/run/maas/dhcp/*.pid lrw,
4/run/maas/dhcp/*.trace lrw,
5/run/maas/dhcp/*.leases* lrw,
6/var/lib/maas/dhcp/dhcpd*.leases* lrw,
7/etc/maas/dhcpd.conf r,
08
=== added file 'debian/maas-dhcp.install'
--- debian/maas-dhcp.install 1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.install 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
1/debian/tmp/etc/apparmor.d/dhcpd.d/maas
02
=== added file 'debian/maas-dhcp.maas-dhcp-server.upstart'
--- debian/maas-dhcp.maas-dhcp-server.upstart 1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.maas-dhcp-server.upstart 2014-07-15 21:22:45 +0000
@@ -0,0 +1,65 @@
1description "MAAS instance of ISC DHCP server"
2author "Jeroen Vermeulen <jtv@canonical.com>"
3
4start on runlevel [2345]
5stop on runlevel [!2345]
6
7env CONFIG_FILE=/etc/maas/dhcpd.conf
8env PID_DIR=/run/maas/dhcp
9env PID_FILE=/run/maas/dhcp/dhcpd.pid
10env LEASES_DIR=/var/lib/maas/dhcp
11env LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases
12
13# This is where we write what interfaces dhcpd should listen on.
14env INTERFACES_FILE=/var/lib/maas/dhcpd-interfaces
15
16pre-start script
17 if [ ! -f $CONFIG_FILE ]; then
18 echo "$CONFIG_FILE does not exist. Aborting."
19 stop
20 exit 0
21 fi
22
23 if [ ! -f $INTERFACES_FILE ]; then
24 echo "$INTERFACES_FILE does not exist. Aborting."
25 stop
26 exit 0
27 fi
28
29 if ! /usr/sbin/dhcpd -t -q -4 -cf $CONFIG_FILE > /dev/null 2>&1; then
30 echo "dhcpd self-test failed. Please fix the config file."
31 echo "The error was: "
32 /usr/sbin/dhcpd -t -4 -cf $CONFIG_FILE
33 stop
34 exit 0
35 fi
36end script
37
38respawn
39script
40 INTERFACES=`cat "${INTERFACES_FILE}"`
41
42 # Allow dhcp server to write lease and pid file.
43 mkdir -p $PID_DIR
44 chown dhcpd:dhcpd $PID_DIR
45
46 # As of Quantal, the leases file must be owned by root:root (even though
47 # the daemon will run under an unprivileged user).
48 # In Precise, ownership was supposed to be dhcpd:dhcpd.
49 #
50 # maas packages on saucy are only supported with newer isc-dhcp via
51 # the cloud-archive. See bug 1231693 for more information, including
52 # a patch that would actually work to support all, but is complex.
53
54 mkdir -p $LEASES_DIR
55 chown root:root $LEASES_DIR
56 [ -e $LEASES_FILE ] || touch $LEASES_FILE
57 for LFILE in $LEASES_FILE $LEASES_FILE~; do
58 if [ -e $LFILE ]; then
59 chown root:root $LFILE
60 chmod a+r $LFILE
61 fi
62 done
63
64 exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES
65end script
066
=== added file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst 1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.postinst 2014-07-15 21:22:45 +0000
@@ -0,0 +1,15 @@
1#!/bin/sh
2
3set -e
4
5if [ "$1" = "configure" ]; then
6 invoke-rc.d isc-dhcp-server stop
7
8 dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
9 if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1
10 then
11 apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" || true
12 fi
13fi
14
15#DEBHELPER#
016
=== added file 'debian/maas-dhcp.postrm'
--- debian/maas-dhcp.postrm 1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.postrm 2014-07-15 21:22:45 +0000
@@ -0,0 +1,13 @@
1#!/bin/sh
2
3set -e
4
5if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
6 dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
7 if [ -f "${dhcpd_prof}" ] &&
8 command -v apparmor_parser >/dev/null 2>&1; then
9 apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}"
10 fi
11fi
12
13#DEBHELPER#
014
=== added file 'debian/maas-dns.dirs'
--- debian/maas-dns.dirs 1970-01-01 00:00:00 +0000
+++ debian/maas-dns.dirs 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
1etc/bind/maas
02
=== added file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst 1970-01-01 00:00:00 +0000
+++ debian/maas-dns.postinst 2014-07-15 21:22:45 +0000
@@ -0,0 +1,46 @@
1#!/bin/sh
2
3set -e
4
5if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then
6 # If /etc/bind/maas is empty, set_up_dns.
7 if [ ! "$(ls -A /etc/bind/maas)" ]; then
8 maas-region-admin set_up_dns
9 fi
10
11 # Fix permissions.
12 if [ -d /etc/bind/maas ]; then
13 chown -R maas:root /etc/bind/maas
14 fi
15 if [ -f /etc/bind/maas/named.conf.maas ]; then
16 chmod 644 /etc/bind/maas/named.conf.maas
17 fi
18 if [ -f /etc/bind/maas/rndc.conf.maas ]; then
19 chmod 600 /etc/bind/maas/rndc.conf.maas
20 fi
21 if [ -f /etc/bind/maas/named.conf.rndc.maas ]; then
22 chown maas:bind /etc/bind/maas/named.conf.rndc.maas
23 chmod 640 /etc/bind/maas/named.conf.rndc.maas
24 fi
25
26 # Remove any existing MAAS-related include line from
27 # /etc/bind/named.conf.local, then re-add it.
28 sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
29 maas-region-admin get_named_conf --edit --config_path /etc/bind/named.conf.local
30 # Add a line in /etc/bind/named.conf.options that includes the
31 # /etc/named/maas/named.conf.options.inside.maas file.
32 maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options
33
34 invoke-rc.d bind9 restart || true
35fi
36
37if [ "$1" = "configure" ]; then
38 # If the /etc/bind/named.conf.options is not set up yet, do it now.
39 # This might happen because of an upgrade from an older package.
40 if ! grep -qs "named.conf.options.inside.maas" /etc/bind/named.conf.options; then
41 maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options
42 invoke-rc.d bind9 restart || true
43 fi
44fi
45
46#DEBHELPER#
047
=== added file 'debian/maas-dns.postrm'
--- debian/maas-dns.postrm 1970-01-01 00:00:00 +0000
+++ debian/maas-dns.postrm 2014-07-15 21:22:45 +0000
@@ -0,0 +1,23 @@
1#!/bin/sh
2
3set -e
4
5if [ "$1" = "remove" ]; then
6 if [ -f /etc/bind/named.conf.local ]; then
7 sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.maas\"\;$/d' \
8 /etc/bind/named.conf.local
9 fi
10fi
11
12if [ "$1" = "purge" ]; then
13 # Remove zone files
14 if [ -d /etc/bind/maas ]; then
15 rm -rf /etc/bind/maas
16 fi
17fi
18
19if [ -x /usr/sbin/invoke-rc.d ]; then
20 invoke-rc.d bind9 restart || true
21fi
22
23#DEBHELPER#
024
=== added file 'debian/maas-region-controller-min.apport'
--- debian/maas-region-controller-min.apport 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.apport 2014-07-15 21:22:45 +0000
@@ -0,0 +1,37 @@
1#!/usr/bin/python
2
3'''apport hook for maas-region-controller
4
5(c) 2012 Canonical Ltd.
6Author: Andres Rodriguez <andres.rodriguez@canonical.com>
7
8This program is free software; you can redistribute it and/or modify it
9under the terms of the GNU General Public License as published by the
10Free Software Foundation; either version 2 of the License, or (at your
11option) any later version. See http://www.gnu.org/copyleft/gpl.html for
12the full text of the license.
13'''
14
15from apport.hookutils import *
16
17def add_info(report, ui):
18 response = ui.yesno("The contents of your /etc/maas/maas_local_settings.py, "
19 "/etc/maas/txlongpoll.yaml, /etc/maas/pserv.yaml files "
20 "may help developers diagnose your bug more "
21 "quickly. However, it may contain sensitive "
22 "information. Do you want to include it in your "
23 "bug report?")
24
25 if response == None: # user cancelled
26 raise StopIteration
27
28 elif response == True:
29 attach_conffiles(report,'maas')
30
31 # Attaching log files
32 attach_file_if_exists(report, '/var/log/maas/maas.log', 'MAASLog')
33 attach_file_if_exists(report, '/var/log/maas/pserv.log', 'MAASPservLog')
34 attach_file_if_exists(report, '/var/log/maas/txlongpoll.log', 'MAAStxlongpollLog')
35
36 # Attaching related packages info
37 attach_related_packages(report, ['python-django-maas', 'apparmor'])
038
=== added file 'debian/maas-region-controller-min.dirs'
--- debian/maas-region-controller-min.dirs 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.dirs 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
1var/log/maas/oops
02
=== added file 'debian/maas-region-controller-min.install'
--- debian/maas-region-controller-min.install 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.install 2014-07-15 21:22:45 +0000
@@ -0,0 +1,40 @@
1# Install project
2debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas
3
4# Install static files
5debian/tmp/usr/share/maas/web/static
6
7# Install Apache Config
8debian/tmp/etc/maas/maas-http.conf
9
10# Install MAAS local settings
11debian/tmp/etc/maas/maas_local_settings.py
12
13# Install celery config file
14debian/tmp/usr/share/maas/celeryconfig.py
15
16# Install local celery region config file
17debian/tmp/etc/maas/maas_local_celeryconfig.py
18
19# Install WSGI
20debian/tmp/usr/share/maas/wsgi.py
21
22# Install txlongpoll config file
23debian/tmp/etc/maas/txlongpoll.yaml
24
25# Install new preseed files
26debian/tmp/etc/maas/preseeds
27
28# Install templates
29debian/tmp/etc/maas/templates/dns
30debian/tmp/etc/maas/templates/commissioning-user-data
31
32# Install driver configuration file
33debian/tmp/etc/maas/drivers.yaml
34
35# Install all other stuff
36debian/extras/maas-region-admin usr/sbin
37debian/extras/maas-region-celeryd usr/sbin
38debian/extras/20-maas.conf etc/rsyslog.d
39debian/extras/maas_remote_syslog_compress etc/cron.d
40debian/extras/99-maas usr/share/maas/conf
041
=== added file 'debian/maas-region-controller-min.links'
--- debian/maas-region-controller-min.links 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.links 2014-07-15 21:22:45 +0000
@@ -0,0 +1,2 @@
1etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py
2etc/maas/maas_local_celeryconfig.py usr/share/maas/maas_local_celeryconfig.py
03
=== added file 'debian/maas-region-controller-min.lintian-overrides'
--- debian/maas-region-controller-min.lintian-overrides 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.lintian-overrides 2014-07-15 21:22:45 +0000
@@ -0,0 +1,6 @@
1maas-region-controller: binary-without-manpage usr/sbin/maas
2maas-region-controller: binary-without-manpage usr/sbin/maas-region-celeryd
3maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py
4maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py
5maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template
6maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py
07
=== added file 'debian/maas-region-controller-min.logrotate'
--- debian/maas-region-controller-min.logrotate 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.logrotate 2014-07-15 21:22:45 +0000
@@ -0,0 +1,18 @@
1/var/log/maas/maas.log {
2 rotate 5
3 weekly
4 compress
5 copytruncate
6 missingok
7 #create 620 root www-data
8}
9
10/var/log/maas/txlongpoll.log {
11 rotate 5
12 weekly
13 compress
14 missingok
15 postrotate
16 [ -r /var/run/maas-txlongpoll.pid ] && kill -s USR2 $(cat /var/run/maas-txlongpoll.pid) || true
17 endscript
18}
019
=== added file 'debian/maas-region-controller-min.maas-region-celery.upstart'
--- debian/maas-region-controller-min.maas-region-celery.upstart 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.maas-region-celery.upstart 2014-07-15 21:22:45 +0000
@@ -0,0 +1,27 @@
1# maas-celery - celery daemon for the region controller
2#
3# MAAS Region Controller Celery Daemon
4
5description "MAAS"
6author "Raphael Badin <raphael.badin@canonical.com>"
7
8start on filesystem and net-device-up and rabbitmq-server-running
9stop on runlevel [016]
10
11respawn
12
13env workers_user="maas_workers"
14env workers_pass=""
15env workers_vhost="/maas_workers"
16env DJANGO_SETTINGS_MODULE="maas.settings"
17
18pre-start script
19 if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$workers_user" 1>/dev/null 2>&1; then
20 workers_pass=`grep "maas_workers" /etc/maas/maas_local_celeryconfig.py | cut -d':' -f3 | cut -d'@' -f1`
21 /usr/sbin/rabbitmqctl add_user "$workers_user" "$workers_pass"
22 /usr/sbin/rabbitmqctl add_vhost "$workers_vhost"
23 /usr/sbin/rabbitmqctl set_permissions -p "$workers_vhost" "$workers_user" ".*" ".*" ".*"
24 fi
25end script
26
27exec /usr/sbin/maas-region-celeryd --logfile=/var/log/maas/celery-region.log --schedule=/var/lib/maas/celerybeat-region-schedule --user=maas --group=maas
028
=== added file 'debian/maas-region-controller-min.maas-txlongpoll.upstart'
--- debian/maas-region-controller-min.maas-txlongpoll.upstart 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.maas-txlongpoll.upstart 2014-07-15 21:22:45 +0000
@@ -0,0 +1,27 @@
1# maas - txlongpoll service
2#
3# MAAS Provisioning Service txlongpoll
4
5description "MAAS txlongpoll"
6author "Andres Rodriguez <andres.rodriguez@canonical.com>"
7
8start on filesystem and net-device-up and rabbitmq-server-running
9stop on runlevel [016]
10
11respawn
12
13env longpoll_user="maas_longpoll"
14env longpoll_pass=""
15env longpoll_vhost="/maas_longpoll"
16
17pre-start script
18 if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$longpoll_user" 1>/dev/null 2>&1; then
19 longpoll_pass=`/bin/grep "password" /etc/maas/txlongpoll.yaml | cut -d'"' -f2`
20 /usr/sbin/rabbitmqctl add_user "$longpoll_user" "$longpoll_pass"
21 /usr/sbin/rabbitmqctl add_vhost "$longpoll_vhost"
22 /usr/sbin/rabbitmqctl set_permissions -p "$longpoll_vhost" "$longpoll_user" ".*" ".*" ".*"
23 fi
24end script
25
26# To add options to your daemon, edit the line below:
27exec /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-txlongpoll.pid --logfile=/dev/null txlongpoll --config-file=/etc/maas/txlongpoll.yaml
028
=== added file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.postinst 2014-07-15 21:22:45 +0000
@@ -0,0 +1,170 @@
1#!/bin/sh
2
3set -e
4
5. /usr/share/debconf/confmodule
6db_version 2.0
7
8RELEASE=`lsb_release -rs` || RELEASE=""
9
10restart_squid_deb_proxy() {
11 invoke-rc.d squid-deb-proxy restart || true
12}
13
14configure_region_http() {
15 case $RELEASE in
16 12.04|12.10|13.04)
17 # handle apache configs
18 if [ -e /etc/maas/maas-http.conf -a \
19 ! -e /etc/apache2/conf.d/maas-http.conf ]; then
20 ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf
21 fi
22 ;;
23 *)
24 # handle apache configs
25 if [ -e /etc/maas/maas-http.conf -a \
26 ! -e /etc/apache2/conf-enabled/maas-http.conf ]; then
27 ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
28 fi
29 ;;
30 esac
31 # enable apache modules needed
32 a2enmod proxy_http
33 a2enmod expires
34 a2enmod wsgi
35}
36
37configure_maas_default_url() {
38 local ipaddr="$1"
39
40 if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then
41 sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/$ipaddr\/MAAS\"/" /etc/maas/maas_local_settings.py
42 fi
43}
44
45get_default_route_ip() {
46 while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do
47 [ "$Mask" = "00000000" ] && break
48 done < /proc/net/route
49 interface="$Iface"
50 ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global)
51 ipaddr=${ipaddr#* inet }
52 ipaddr=${ipaddr%%/*}
53 echo $ipaddr
54}
55
56configure_maas_squid_deb_proxy() {
57 local ipaddr="$1"
58
59 if [ -e /usr/share/maas/conf/99-maas -a \
60 ! -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
61 ln -sf /usr/share/maas/conf/99-maas \
62 /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
63 fi
64
65 sed -i "s/\(^[a-zA-Z0-9\.\-].*\) # maasurl$/$ipaddr # maasurl/" \
66 /usr/share/maas/conf/99-maas
67}
68
69# Please keep this stanza until 14.10
70if [ "$1" = "configure" ]; then
71 if dpkg --compare-versions "$2" le-nl 1.5+bzr1909-0ubuntu1 ; then
72 chown root:maas /etc/maas/txlongpoll.yaml
73 chmod 0640 /etc/maas/txlongpoll.yaml
74 fi
75fi
76
77if [ "$1" = "configure" ] && [ -z "$2" ]; then
78 #########################################################
79 ################ Folder Permissions ####################
80 #########################################################
81 mkdir -p /var/lib/maas/media/storage
82 chown -R maas:maas /var/lib/maas/
83
84 # Config will contain credentials, so should be readable
85 # by the application but nobody else.
86 chown root:maas \
87 /etc/maas/maas_local_celeryconfig.py \
88 /etc/maas/maas_local_settings.py \
89 /etc/maas/txlongpoll.yaml
90 chmod 0640 \
91 /etc/maas/maas_local_celeryconfig.py \
92 /etc/maas/maas_local_settings.py \
93 /etc/maas/txlongpoll.yaml
94
95 #########################################################
96 ################ Configure Apache2 ####################
97 #########################################################
98 configure_region_http
99
100 #########################################################
101 ########## Configure DEFAULT_MAAS_URL #################
102 #########################################################
103
104 # Obtain IP address of default route and change DEFAULT_MAAS_URL
105 # if default-maas-url has not been preseeded.
106 db_get maas/default-maas-url
107 ipaddr="$RET"
108 if [ -z "$RET" ]; then
109 ipaddr=$(get_default_route_ip)
110 fi
111 # Set the IP address of the interface with default route
112 if [ -n "$ipaddr" ]; then
113 configure_maas_default_url "$ipaddr"
114 configure_maas_squid_deb_proxy "$ipaddr"
115 db_set maas/default-maas-url "$ipaddr"
116 fi
117
118 #########################################################
119 ################ Configure Logging ####################
120 #########################################################
121
122 # Give appropriate permissions
123 if [ ! -f /var/log/maas/maas.log ]; then
124 touch /var/log/maas/maas.log
125 fi
126 chown -R maas:maas /var/log/maas
127 chmod -R 775 /var/log/maas/oops
128
129 # Create log directory base
130 mkdir -p /var/log/maas/rsyslog
131 chown -R syslog:syslog /var/log/maas/rsyslog
132 # Make sure rsyslog reads our config
133 invoke-rc.d rsyslog restart
134
135 #########################################################
136 ################### Squid-deb-proxy ####################
137 #########################################################
138 # Make sure squid-deb-proxy reads our config (99-maas)
139 restart_squid_deb_proxy
140
141elif [ -n "$DEBCONF_RECONFIGURE" ]; then
142 # Set the IP address of the interface with default route
143 db_get maas/default-maas-url
144 ipaddr="$RET"
145 if [ -n "$ipaddr" ]; then
146 configure_maas_default_url "$ipaddr"
147 configure_maas_squid_deb_proxy "$ipaddr"
148 fi
149
150elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
151 # If upgrading to any later package version, then upgrade db.
152 invoke-rc.d apache2 stop || true
153
154 # make sure maas http config is symlinked
155 configure_region_http
156
157 # we need to regenerate the passwords and update configs.
158 db_get maas/default-maas-url
159 ipaddr="$RET"
160 configure_maas_default_url "$ipaddr"
161 configure_maas_squid_deb_proxy "$ipaddr"
162fi
163
164invoke-rc.d apache2 restart || true
165
166restart_squid_deb_proxy
167
168db_stop
169
170#DEBHELPER#
0171
=== added file 'debian/maas-region-controller-min.postrm'
--- debian/maas-region-controller-min.postrm 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.postrm 2014-07-15 21:22:45 +0000
@@ -0,0 +1,39 @@
1#!/bin/sh
2
3set -e
4
5. /usr/share/debconf/confmodule
6
7RELEASE=`lsb_release -rs` || RELEASE=""
8
9case "$1" in
10 purge)
11 rm -rf /var/log/maas
12 rm -rf /var/lib/maas
13 case $RELEASE in
14 12.04|12.10|13.04)
15 if [ -h /etc/apache2/conf.d/maas-http.conf ]; then
16 rm -rf /etc/apache2/conf.d/maas-http.conf
17 fi
18 ;;
19 *)
20 if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then
21 rm -rf /etc/apache2/conf-enabled/maas-http.conf
22 fi
23 ;;
24 esac
25
26 # Restarting apache2
27 if [ -x /usr/sbin/invoke-rc.d ]; then
28 invoke-rc.d apache2 restart || true
29 fi
30
31 # Delete symlink
32 if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
33 rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
34 fi
35esac
36
37#DEBHELPER#
38
39db_stop
040
=== added file 'debian/maas-region-controller-min.prerm'
--- debian/maas-region-controller-min.prerm 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.prerm 2014-07-15 21:22:45 +0000
@@ -0,0 +1,9 @@
1#!/bin/sh
2
3set -e
4
5. /usr/share/debconf/confmodule
6
7#DEBHELPER#
8
9invoke-rc.d apache2 stop || true
010
=== added file 'debian/maas-region-controller-min.templates'
--- debian/maas-region-controller-min.templates 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.templates 2014-07-15 21:22:45 +0000
@@ -0,0 +1,22 @@
1Template: maas/installation-note
2Type: note
3Default: false
4_Description: Ubuntu MAAS Server
5 The Ubuntu MAAS Server has been installed in your system. You
6 can access the MAAS Web interface here:
7 .
8 http://${MAAS_URL}/MAAS
9 .
10 If the automatically detected address above is not in the same
11 network as the MAAS clients, you need to reconfigure it:
12 .
13 sudo dpkg-reconfigure maas-region-controller
14
15Template: maas/default-maas-url
16Type: string
17_Description: Ubuntu MAAS PXE/Provisioning network address:
18 The Ubuntu MAAS Server automatically detects the IP address
19 that is used for PXE and provisioning. However, it needs to be
20 in the same network as the clients. If the automatically
21 detected address is not in the same network as the clients, it
22 must be changed.
023
=== added file 'debian/maas-region-controller.config'
--- debian/maas-region-controller.config 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller.config 2014-07-15 21:22:45 +0000
@@ -0,0 +1,45 @@
1#!/bin/sh
2
3set -e
4
5. /usr/share/debconf/confmodule
6db_version 2.0
7
8# creates question
9set_question() {
10 if ! db_fget "$1" seen; then
11 db_register dbconfig-common/dbconfig-install "$1"
12 db_subst "$1" ID "$1"
13 db_fget "$1" seen
14 fi
15 if [ "$RET" = false ]; then
16 db_set "$1" "$2"
17 db_fset "$1" seen true
18 fi
19}
20
21# source dbconfig-common shell library, and call the hook function
22if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
23 . /usr/share/dbconfig-common/dpkg/config.pgsql
24fi
25
26if [ "$1" = "configure" ] && [ -z "$2" ]; then
27 # Hide maas/dbconfig-install question by setting default.
28 set_question maas-region-controller/dbconfig-install true
29 set_question maas-region-controller/pgsql/app-pass ""
30
31 dbc_dbname="maasdb"
32 dbc_dbuser="maas"
33 dbc_remove="true"
34
35 dbc_go maas-region-controller $@
36
37elif [ -n "$DEBCONF_RECONFIGURE" ]; then
38 db_get maas/default-maas-url || true
39 if [ -z "$RET" ]; then
40 ipaddr=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"/")} END{print array[3] }' /etc/maas/maas_local_settings.py)
41 db_set maas/default-maas-url "$ipaddr"
42 fi
43 db_input low maas/default-maas-url || true
44 db_go
45fi
046
=== added file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller.postinst 2014-07-15 21:22:45 +0000
@@ -0,0 +1,301 @@
1#!/bin/sh
2
3set -e
4
5. /usr/share/debconf/confmodule
6db_version 2.0
7
8if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
9 . /usr/share/dbconfig-common/dpkg/postinst.pgsql
10fi
11
12RELEASE=`lsb_release -rs` || RELEASE=""
13
14maas_sync_migrate_db(){
15 maas-region-admin syncdb --noinput
16 maas-region-admin migrate maasserver --noinput
17 maas-region-admin migrate metadataserver --noinput
18}
19
20restart_rabbitmq(){
21 invoke-rc.d rabbitmq-server restart || true
22}
23
24restart_postgresql(){
25 invoke-rc.d --force postgresql restart || true
26}
27
28restart_squid_deb_proxy() {
29 invoke-rc.d squid-deb-proxy restart || true
30}
31
32configure_region_http() {
33 case $RELEASE in
34 12.04|12.10|13.04)
35 # handle apache configs
36 if [ -e /etc/maas/maas-http.conf -a \
37 ! -e /etc/apache2/conf.d/maas-http.conf ]; then
38 ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf
39 fi
40 ;;
41 *)
42 # handle apache configs
43 if [ -e /etc/maas/maas-http.conf -a \
44 ! -e /etc/apache2/conf-enabled/maas-http.conf ]; then
45 ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
46 fi
47 ;;
48 esac
49 # enable apache modules needed
50 a2enmod proxy_http
51 a2enmod expires
52 a2enmod wsgi
53}
54
55configure_maas_txlongpoll_rabbitmq_user() {
56 local longpoll_user="maas_longpoll"
57 local longpoll_pass=
58 local longpoll_vhost="/maas_longpoll"
59 longpoll_pass="$(pwgen -s 20)"
60 if [ -x /usr/sbin/rabbitmqctl ]; then
61 if ! rabbitmqctl list_users | grep -qs "$longpoll_user"; then
62 rabbitmqctl add_user "$longpoll_user" "$longpoll_pass" || true
63 rabbitmqctl add_vhost "$longpoll_vhost" || true
64 rabbitmqctl set_permissions -p "$longpoll_vhost" "$longpoll_user" ".*" ".*" ".*" || true
65 else
66 rabbitmqctl change_password "$longpoll_user" "$longpoll_pass" || true
67 fi
68 fi
69
70 if grep -qs "^\ \{1,\}password: \"[a-zA-Z0-9]\{0,\}\"$" /etc/maas/txlongpoll.yaml; then
71 sed -i "s/^\ \{1,\}password: \"[a-zA-Z0-9]\{0,\}\"$/ password: \""$longpoll_pass"\"/" \
72 /etc/maas/txlongpoll.yaml
73 fi
74 if grep -qs "^RABBITMQ_PASSWORD\ \= '[a-zA-Z0-9]\{0,\}'$" /etc/maas/maas_local_settings.py; then
75 sed -i "s/^RABBITMQ_PASSWORD\ \= '[a-zA-Z0-9]\{0,\}'$/RABBITMQ_PASSWORD = '"$longpoll_pass"'/" \
76 /etc/maas/maas_local_settings.py
77 fi
78}
79
80configure_maas_workers_rabbitmq_user() {
81 local workers_user="maas_workers"
82 local workers_pass="$(pwgen -s 20)"
83 local workers_vhost="/maas_workers"
84 local amqp_host="$1"
85 if [ -z "$amqp_host" ]; then
86 amqp_host="localhost"
87 fi
88 local amqp_port="5672"
89 if [ -x /usr/sbin/rabbitmqctl ]; then
90 if ! rabbitmqctl list_users | grep -qs "$workers_user"; then
91 rabbitmqctl add_user "$workers_user" "$workers_pass" || true
92 rabbitmqctl add_vhost "$workers_vhost" || true
93 rabbitmqctl set_permissions -p "$workers_vhost" "$workers_user" ".*" ".*" ".*" || true
94 else
95 rabbitmqctl change_password "$workers_user" "$workers_pass" || true
96 fi
97 fi
98
99 if grep -qs "^BROKER_URL\ \= '.*'$" /etc/maas/maas_local_celeryconfig.py; then
100 local broker_url="amqp://$workers_user:$workers_pass@$amqp_host:$amqp_port/$workers_vhost"
101 sed -i "s|^BROKER_URL\ \= '.*'$|BROKER_URL = '"$broker_url"'|" \
102 /etc/maas/maas_local_celeryconfig.py
103 fi
104}
105
106configure_maas_database() {
107 local dbc_dbpass="$1"
108 if grep -qs "^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$" /etc/maas/maas_local_settings.py; then
109 sed -i "s/^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$/ 'PASSWORD': '"$dbc_dbpass"',/" \
110 /etc/maas/maas_local_settings.py
111 fi
112}
113
114configure_maas_default_url() {
115 local ipaddr="$1"
116
117 if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then
118 sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/"$ipaddr"\/MAAS\"/" \
119 /etc/maas/maas_local_settings.py
120 fi
121}
122
123get_default_route_ip() {
124 while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do
125 [ "$Mask" = "00000000" ] && break
126 done < /proc/net/route
127 interface="$Iface"
128 ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global)
129 ipaddr=${ipaddr#* inet }
130 ipaddr=${ipaddr%%/*}
131 echo $ipaddr
132}
133
134configure_maas_squid_deb_proxy() {
135 local ipaddr="$1"
136
137 if [ -e /usr/share/maas/conf/99-maas -a \
138 ! -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
139 ln -sf /usr/share/maas/conf/99-maas \
140 /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
141 fi
142
143 sed -i "s/\(^[a-zA-Z0-9\.\-].*\) # maasurl$/$ipaddr # maasurl/" \
144 /usr/share/maas/conf/99-maas
145}
146
147if [ "$1" = "configure" ] && [ -z "$2" ]; then
148 #########################################################
149 ################ Folder Permissions ####################
150 #########################################################
151 mkdir -p /var/lib/maas/media/storage
152 chown -R maas:maas /var/lib/maas/
153
154 # Config will contain credentials, so should be readable
155 # by the application but nobody else.
156 chown root:maas \
157 /etc/maas/maas_local_celeryconfig.py \
158 /etc/maas/maas_local_settings.py
159 chmod 0640 \
160 /etc/maas/maas_local_celeryconfig.py \
161 /etc/maas/maas_local_settings.py
162
163 #########################################################
164 ################ Configure Apache2 ####################
165 #########################################################
166 configure_region_http
167
168 #########################################################
169 ########## Configure DEFAULT_MAAS_URL #################
170 #########################################################
171
172 # Obtain IP address of default route and change DEFAULT_MAAS_URL
173 # if default-maas-url has not been preseeded.
174 db_get maas/default-maas-url
175 ipaddr="$RET"
176 if [ -z "$RET" ]; then
177 ipaddr=$(get_default_route_ip)
178 fi
179 # Set the IP address of the interface with default route
180 if [ -n "$ipaddr" ]; then
181 configure_maas_default_url "$ipaddr"
182 configure_maas_squid_deb_proxy "$ipaddr"
183 db_subst maas/installation-note MAAS_URL "$ipaddr"
184 db_set maas/default-maas-url "$ipaddr"
185 fi
186
187 #########################################################
188 ################ Configure Logging ####################
189 #########################################################
190
191 # Give appropriate permissions
192 if [ ! -f /var/log/maas/maas.log ]; then
193 touch /var/log/maas/maas.log
194 fi
195 chown -R maas:maas /var/log/maas
196 chmod -R 775 /var/log/maas/oops
197
198 # Create log directory base
199 mkdir -p /var/log/maas/rsyslog
200 chown -R syslog:syslog /var/log/maas/rsyslog
201 # Make sure rsyslog reads our config
202 invoke-rc.d rsyslog restart
203
204 #########################################################
205 ################### Squid-deb-proxy ####################
206 #########################################################
207 # Make sure squid-deb-proxy reads our config (99-maas)
208 invoke-rc.d squid-deb-proxy restart
209
210 #########################################################
211 ########## Configure longpoll rabbitmq config ###########
212 #########################################################
213
214 # Handle longpoll/rabbitmq publishing
215 restart_rabbitmq
216 configure_maas_txlongpoll_rabbitmq_user
217
218 #########################################################
219 ########## Configure worker rabbitmq config ###########
220 #########################################################
221
222 # Handle celery/rabbitmq publishing
223 configure_maas_workers_rabbitmq_user "$ipaddr"
224
225 #########################################################
226 ################ Configure Database ###################
227 #########################################################
228
229 # Need to for postgresql start so it doesn't fail on the installer
230 restart_postgresql
231
232 # Create the database
233 dbc_go maas-region-controller $@
234 configure_maas_database "$dbc_dbpass"
235
236 # Only syncdb if we have selected to install it with dbconfig-common.
237 db_get maas-region-controller/dbconfig-install
238 if [ "$RET" = "true" ]; then
239 maas_sync_migrate_db
240 fi
241
242 # Display installation note
243 db_input low maas/installation-note || true
244 db_go
245
246elif [ -n "$DEBCONF_RECONFIGURE" ]; then
247 # Set the IP address of the interface with default route
248 db_get maas/default-maas-url
249 ipaddr="$RET"
250 if [ -n "$ipaddr" ]; then
251 configure_maas_default_url "$ipaddr"
252 configure_maas_squid_deb_proxy "$ipaddr"
253 configure_maas_workers_rabbitmq_user "$ipaddr"
254 fi
255 configure_maas_txlongpoll_rabbitmq_user
256
257elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
258 # If upgrading to any later package version, then upgrade db.
259 invoke-rc.d apache2 stop || true
260
261 # make sure postgresql is running
262 restart_postgresql
263
264 # make sure maas http config is symlinked
265 configure_region_http
266
267 # we need to regenerate the passwords and update configs.
268 db_get maas/default-maas-url
269 ipaddr="$RET"
270 configure_maas_default_url "$ipaddr"
271 configure_maas_squid_deb_proxy "$ipaddr"
272 # make sure rabbitmq is running
273 restart_rabbitmq
274 configure_maas_txlongpoll_rabbitmq_user
275 # Handle celery/rabbitmq publishing
276 configure_maas_workers_rabbitmq_user "$ipaddr"
277 # handle database upgrade
278 if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
279 # source dbconfig-common db config for maas-region-controller
280 # before upgrading database, otherwise a new config is written
281 # but the password is no longer preserved.
282 . /etc/dbconfig-common/maas-region-controller.conf
283 else
284 dbc_go maas-region-controller $@
285 fi
286 configure_maas_database "$dbc_dbpass"
287
288 maas_sync_migrate_db
289
290fi
291
292invoke-rc.d apache2 restart || true
293
294restart_squid_deb_proxy
295
296invoke-rc.d maas-txlongpoll restart || true
297invoke-rc.d maas-region-celery restart || true
298
299db_stop
300
301#DEBHELPER#
0302
=== added file 'debian/maas-region-controller.postrm'
--- debian/maas-region-controller.postrm 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller.postrm 2014-07-15 21:22:45 +0000
@@ -0,0 +1,59 @@
1#!/bin/sh
2
3set -e
4
5. /usr/share/debconf/confmodule
6
7RELEASE=`lsb_release -rs` || RELEASE=""
8
9if [ -f /etc/dbconfig-common/maas.conf ]; then
10 if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
11 . /usr/share/dbconfig-common/dpkg/postrm.pgsql
12 dbc_go maas-region-controller $@
13 fi
14fi
15
16case "$1" in
17 purge)
18 rm -rf /var/log/maas
19 rm -rf /var/lib/maas
20 case $RELEASE in
21 12.04|12.10|13.04)
22 if [ -h /etc/apache2/conf.d/maas-http.conf ]; then
23 rm -rf /etc/apache2/conf.d/maas-http.conf
24 fi
25 ;;
26 *)
27 if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then
28 rm -rf /etc/apache2/conf-enabled/maas-http.conf
29 fi
30 ;;
31 esac
32
33 # Restarting apache2
34 if [ -x /usr/sbin/invoke-rc.d ]; then
35 invoke-rc.d apache2 restart || true
36 fi
37
38 # Delete symlink
39 if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
40 rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
41 fi
42
43 # Remove rabbitmq/longpoll/celery
44 longpoll_user="maas_longpoll"
45 longpoll_vhost="/maas_longpoll"
46 workers_user="maas_workers"
47 workers_vhost="/maas_workers"
48 if [ -x /usr/sbin/rabbitmqctl ]; then
49 rabbitmqctl delete_vhost "$longpoll_vhost" || true
50 rabbitmqctl delete_user "$longpoll_user" || true
51
52 rabbitmqctl delete_vhost "$workers_vhost" || true
53 rabbitmqctl delete_user "$workers_user" || true
54 fi
55esac
56
57#DEBHELPER#
58
59db_stop
060
=== added file 'debian/maas-region-controller.prerm'
--- debian/maas-region-controller.prerm 1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller.prerm 2014-07-15 21:22:45 +0000
@@ -0,0 +1,12 @@
1#!/bin/sh
2
3set -e
4
5. /usr/share/debconf/confmodule
6
7#DEBHELPER#
8
9invoke-rc.d apache2 stop || true
10
11. /usr/share/dbconfig-common/dpkg/prerm.pgsql
12dbc_go maas-region-controller $@
013
=== added file 'debian/maintscript'
--- debian/maintscript 1970-01-01 00:00:00 +0000
+++ debian/maintscript 2014-07-15 21:22:45 +0000
@@ -0,0 +1,2 @@
1rm_conffile /etc/init/maas-celery.conf 0.1+bzr971+dfsg-0ubuntu2
2rm_conffile /etc/dbconfig-common/maas.conf 0.1+bzr971+dfsg-0ubuntu2
03
=== added directory 'debian/patches'
=== added file 'debian/patches/01-fix-database-settings.patch'
--- debian/patches/01-fix-database-settings.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/01-fix-database-settings.patch 2014-07-15 21:22:45 +0000
@@ -0,0 +1,24 @@
1--- maas-1.5+bzr1908.orig.orig/contrib/maas_local_settings.py 2014-02-07 11:22:59.330556956 -0500
2+++ maas-1.5+bzr1908.orig/contrib/maas_local_settings.py 2014-02-07 11:22:59.326556956 -0500
3@@ -7,7 +7,7 @@
4 DEFAULT_MAAS_URL = "http://maas.internal.example.com/"
5
6 # Absolute path to the directory static files should be collected to.
7-STATIC_ROOT = '/var/lib/maas/static/'
8+STATIC_ROOT = '/usr/share/maas/web/static/'
9
10 # Prefix to use for MAAS's urls.
11 # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with
12@@ -81,9 +81,9 @@
13 'default': {
14 # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.
15 'ENGINE': 'django.db.backends.postgresql_psycopg2',
16- 'NAME': '',
17- 'USER': '',
18- 'PASSWORD': '',
19+ 'NAME': 'maasdb',
20+ 'USER': 'maas',
21+ 'PASSWORD': 'maas',
22 'HOST': 'localhost',
23 }
24 }
025
=== added file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/02-pserv-config.patch 2014-07-15 21:22:45 +0000
@@ -0,0 +1,34 @@
1Description: Use default settings for MAAS PSERV
2 Use default settings for MAAS pserv. These default settings
3 include port, logfile, oops directory, cobbler url and username
4Author: Andres Rodriguez <andreserl@ubuntu.com>
5
6--- a/etc/maas/pserv.yaml
7+++ b/etc/maas/pserv.yaml
8@@ -6,7 +6,7 @@
9 ## running server.
10 #
11 # logfile: "pserv.log"
12-logfile: "/dev/null"
13+logfile: "/var/log/maas/pserv.log"
14
15 ## OOPS configuration (optional).
16 #
17@@ -15,7 +15,7 @@
18 # or directories other than what the oops machinery creates there.
19 #
20 # directory:
21- directory: "logs/oops"
22+ directory: "/var/log/maas/oops"
23 # reporter:
24 reporter: "maas-pserv"
25
26@@ -38,8 +38,6 @@
27 # resource_root: /var/lib/maas/boot-resources/current/
28
29 # port: 69
30- port: 5244
31 ## The URL to be contacted to generate PXE configurations.
32 # generator: http://localhost/MAAS/api/1.0/pxeconfig/
33- generator: http://localhost:5243/api/1.0/pxeconfig/
34
035
=== added file 'debian/patches/03-txlongpoll-config.patch'
--- debian/patches/03-txlongpoll-config.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/03-txlongpoll-config.patch 2014-07-15 21:22:45 +0000
@@ -0,0 +1,37 @@
1Description: Use default settings for MAAS txlongpoll
2 Use default settings for MAAS txlongpoll. These default settings
3 include oops directory, Message broker configuration, logfile.
4Author: Andres Rodriguez <andreserl@ubuntu.com>
5
6--- maas-1.5+bzr1908.orig.orig/etc/txlongpoll.yaml 2014-02-07 11:21:12.578557974 -0500
7+++ maas-1.5+bzr1908.orig/etc/txlongpoll.yaml 2014-02-07 11:21:12.578557974 -0500
8@@ -17,7 +17,7 @@
9 # or directories other than what the oops machinery creates there.
10 #
11 # directory: ""
12- directory: "logs/oops"
13+ directory: "/var/log/maas/oops"
14 ## The reporter used when generating OOPS reports.
15 # reporter: "LONGPOLL"
16 reporter: "maas-txlongpoll"
17@@ -25,14 +25,14 @@
18 ## Message broker configuration.
19 #
20 broker:
21- # host: "localhost"
22- # port: 5672
23- # username: "guest"
24- # password: "guest"
25- # vhost: "/"
26+ host: "localhost"
27+ port: 5672
28+ username: "maas_longpoll"
29+ password: "maaslongpoll"
30+ vhost: "/maas_longpoll"
31
32 ## Where to log. This log can be rotated by sending SIGUSR1 to the
33 ## running server.
34 #
35 # logfile: "txlongpoll.log"
36-logfile: "/dev/null"
37+logfile: "/var/log/maas/txlongpoll.log"
038
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2014-07-15 21:22:45 +0000
@@ -0,0 +1,3 @@
101-fix-database-settings.patch
202-pserv-config.patch
303-txlongpoll-config.patch
04
=== added directory 'debian/po'
=== added file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in 1970-01-01 00:00:00 +0000
+++ debian/po/POTFILES.in 2014-07-15 21:22:45 +0000
@@ -0,0 +1,2 @@
1[type: gettext/rfc822deb] maas-region-controller.templates
2[type: gettext/rfc822deb] maas-cluster-controller.templates
03
=== added file 'debian/po/templates.pot'
--- debian/po/templates.pot 1970-01-01 00:00:00 +0000
+++ debian/po/templates.pot 2014-07-15 21:22:45 +0000
@@ -0,0 +1,82 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: maas\n"
10"Report-Msgid-Bugs-To: maas@packages.debian.org\n"
11"POT-Creation-Date: 2012-10-04 13:40-0400\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: \n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"
19
20#. Type: note
21#. Description
22#: ../maas-region-controller.templates:1001
23msgid "Ubuntu MAAS Server"
24msgstr ""
25
26#. Type: note
27#. Description
28#: ../maas-region-controller.templates:1001
29msgid ""
30"The Ubuntu MAAS Server has been installed in your system. You can access the "
31"MAAS Web interface here:"
32msgstr ""
33
34#. Type: note
35#. Description
36#: ../maas-region-controller.templates:1001
37msgid " http://${MAAS_URL}/MAAS"
38msgstr ""
39
40#. Type: note
41#. Description
42#: ../maas-region-controller.templates:1001
43msgid ""
44"If the automatically detected address above is not in the same network as "
45"the MAAS clients, you need to reconfigure it:"
46msgstr ""
47
48#. Type: note
49#. Description
50#: ../maas-region-controller.templates:1001
51msgid " sudo dpkg-reconfigure maas-region-controller"
52msgstr ""
53
54#. Type: string
55#. Description
56#: ../maas-region-controller.templates:2001
57msgid "Ubuntu MAAS PXE/Provisioning network address:"
58msgstr ""
59
60#. Type: string
61#. Description
62#: ../maas-region-controller.templates:2001
63msgid ""
64"The Ubuntu MAAS Server automatically detects the IP address that is used for "
65"PXE and provisioning. However, it needs to be in the same network as the "
66"clients. If the automatically detected address is not in the same network as "
67"the clients, it must be changed."
68msgstr ""
69
70#. Type: string
71#. Description
72#: ../maas-cluster-controller.templates:1001
73msgid "Ubuntu MAAS API address:"
74msgstr ""
75
76#. Type: string
77#. Description
78#: ../maas-cluster-controller.templates:1001
79msgid ""
80"The MAAS Cluster Controller needs to contact the MAAS server to register its "
81"presence. Set the URL to the MAAS API here, e.g. http://192.168.1.1/MAAS"
82msgstr ""
083
=== added file 'debian/python-django-maas.install'
--- debian/python-django-maas.install 1970-01-01 00:00:00 +0000
+++ debian/python-django-maas.install 2014-07-15 21:22:45 +0000
@@ -0,0 +1,2 @@
1debian/tmp/usr/lib/python*/dist-packages/maasserver
2debian/tmp/usr/lib/python*/dist-packages/metadataserver
03
=== added file 'debian/python-maas-client.install'
--- debian/python-maas-client.install 1970-01-01 00:00:00 +0000
+++ debian/python-maas-client.install 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
1debian/tmp/usr/lib/python*/dist-packages/apiclient
02
=== added file 'debian/python-maas-provisioningserver.install'
--- debian/python-maas-provisioningserver.install 1970-01-01 00:00:00 +0000
+++ debian/python-maas-provisioningserver.install 2014-07-15 21:22:45 +0000
@@ -0,0 +1,5 @@
1debian/tmp/usr/lib/python*/dist-packages/provisioningserver
2
3# Install other stuff
4debian/extras/maas-provision usr/sbin
5debian/extras/maas-probe-dhcp usr/sbin
06
=== added file 'debian/python-maas-provisioningserver.lintian-overrides'
--- debian/python-maas-provisioningserver.lintian-overrides 1970-01-01 00:00:00 +0000
+++ debian/python-maas-provisioningserver.lintian-overrides 2014-07-15 21:22:45 +0000
@@ -0,0 +1,2 @@
1python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-provision
2python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-probe-dhcp
03
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2014-07-15 21:22:45 +0000
@@ -0,0 +1,56 @@
1#!/usr/bin/make -f
2
3BUILDHOME = $(CURDIR)/debian/build
4PYTHON = $(shell pyversions -d)
5# Python enum modules.
6py_enums := $(wildcard src/*/enum.py)
7
8%:
9 dh $@ --with python2,apport --buildsystem=python_distutils
10
11override_dh_installinit:
12 dh_installinit --name maas-txlongpoll --no-start
13 dh_installinit --name maas-region-celery --no-start
14 dh_installinit --name maas-pserv
15 dh_installinit --name maas-cluster-celery
16 dh_installinit --name maas-dhcp-server
17
18override_dh_auto_build:
19 dh_auto_build
20
21 mkdir -p $(BUILDHOME)
22 HOME=$(BUILDHOME) PYTHONPATH=$(CURDIR)/src/ $(PYTHON) \
23 $(CURDIR)/src/maasserver/utils/jsenums.py \
24 $(py_enums) > $(BUILDHOME)/enums.js
25
26override_dh_auto_install:
27 dh_auto_install
28
29 # Move static files
30 install -d -m 755 $(CURDIR)/debian/tmp/usr/share/maas/web/static
31 mv $(CURDIR)/debian/tmp/usr/lib/python*/*-packages/maasserver/static \
32 $(CURDIR)/debian/tmp/usr/share/maas/web/
33
34 # Install built enums.js file.
35 cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/
36
37 # install the apparmor profile
38 install -d -m 755 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d
39 install -m 644 $(CURDIR)/debian/maas-dhcp.apparmor \
40 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d/maas
41
42 dh_install --list-missing
43
44override_dh_auto_clean:
45 dh_auto_clean
46 rm -rf $(BUILDHOME)
47 rm -rf src/*.egg-info
48
49DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
50REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
51 | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p')
52VER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
53 | sed -rne 's,^Version: ([^-]+).*,\1,p')
54get-orig-source:
55 bzr export -r $(REV) --root=maas-$(VER).orig \
56 maas_$(VER).orig.tar.gz lp:maas/1.5
057
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2014-07-15 21:22:45 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)
02
=== added file 'debian/watch'
--- debian/watch 1970-01-01 00:00:00 +0000
+++ debian/watch 2014-07-15 21:22:45 +0000
@@ -0,0 +1,3 @@
1version=3
2opts=dversionmangle=s/\.dfsg// \
3http://launchpad.net/maas/+download https://launchpad.net/maas/.*/maas-(.*).tar.*

Subscribers

People subscribed via source and target branches

to all changes: