Merge lp:~allenap/maas/packaging.trusty.authbind-ipv6 into lp:maas/1.5
- packaging.trusty.authbind-ipv6
- Merge into 1.5
Proposed by
Gavin Panella
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Maintainers | 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
-
Configure authbind to permit binding all IPv6 addresses on ports 68 and 69 too.
- 284. By Greg Lutostanski
-
[r=andreserl][bug=1332532][author=lutostag] move python-
seamicroclient dep from maas-cluster- controller to python- maas-provisioni ngserver - 283. By Greg Lutostanski
-
[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
-
Release 1.5.3; open 1.5.4
- 281. By Raphaël Badin
-
Backport revision 278: Add sudoer rule 'maas-dhcp-server stop' job.
- 280. By Julian Edwards
-
open 1.5.3
- 279. By Julian Edwards
-
1.5.2 release
- 278. By Raphaël Badin
-
Add dependency on python-pexpect.
- 277. By Raphaël Badin
-
Bump upstream revision.
- 276. By Andres Rodriguez
-
Fix packaging
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'debian' | |||
2 | === added file 'debian/changelog' | |||
3 | --- debian/changelog 1970-01-01 00:00:00 +0000 | |||
4 | +++ debian/changelog 2014-07-15 21:22:45 +0000 | |||
5 | @@ -0,0 +1,1165 @@ | |||
6 | 1 | maas (1.5.4+bzr2287-0ubuntu1) UNRELEASED; urgency=medium | ||
7 | 2 | |||
8 | 3 | * UNRELEASED | ||
9 | 4 | |||
10 | 5 | [ Greg Lutostanski ] | ||
11 | 6 | * debian/control: | ||
12 | 7 | - maas-cluster-controller depends on grub-common | ||
13 | 8 | - maas-provisioningserver not maas-cluster-controller depends on | ||
14 | 9 | python-seamicroclient (LP: #1332532) | ||
15 | 10 | |||
16 | 11 | + [ Gavin Panella ] | ||
17 | 12 | * debian/maas-cluster-controller.postinst | ||
18 | 13 | - Allow maas-pserv to bind to all IPv6 addresses too. | ||
19 | 14 | |||
20 | 15 | -- Julian Edwards <julian.edwards@canonical.com> Wed, 04 Jun 2014 13:32:00 +1000 | ||
21 | 16 | |||
22 | 17 | maas (1.5.3+bzr2287-0ubuntu1) trusty; urgency=medium | ||
23 | 18 | |||
24 | 19 | * New upstream bugfix release: | ||
25 | 20 | - Reduce number of celery tasks emitted when updating a cluster controller | ||
26 | 21 | (LP: #1324944) | ||
27 | 22 | - Fix VirshSSH template which was referencing invalid attributes | ||
28 | 23 | (LP: #1324966) | ||
29 | 24 | - Fix a start up problem where a database lock was being taken outside of | ||
30 | 25 | a transaction (LP: #1325759) | ||
31 | 26 | - Reformat badly formatted Architecture error message (LP: #1301465) | ||
32 | 27 | - Final changes to support ppc64el (now known as PowerNV) (LP: #1315154) | ||
33 | 28 | |||
34 | 29 | [ Raphaël Badin ] | ||
35 | 30 | * debian/extras/99-maas-sudoers: | ||
36 | 31 | - Add rule 'maas-dhcp-server stop' job. | ||
37 | 32 | |||
38 | 33 | -- Julian Edwards <julian.edwards@canonical.com> Wed, 04 Jun 2014 13:31:46 +1000 | ||
39 | 34 | |||
40 | 35 | maas (1.5.2+bzr2277-0ubuntu1) trusty; urgency=medium | ||
41 | 36 | |||
42 | 37 | * New upstream bugfix release: | ||
43 | 38 | - Remove workaround for fixed Django bug 1311433 (LP: #1311433) | ||
44 | 39 | - Ensure that validation errors are returned when adding a node over | ||
45 | 40 | the API and its cluster controller is not contactable. (LP: #1305061) | ||
46 | 41 | - Hardware enablement support for PowerKVM | ||
47 | 42 | - Shorten the time taken for a cluster to initially connect to the region | ||
48 | 43 | via RPC to around 2 seconds (LP: #1317682) | ||
49 | 44 | - Faster DHCP leases parser (LP: #1305102) | ||
50 | 45 | - Documentation fixed explaining how to enable an ephemeral backdoor | ||
51 | 46 | (LP: #1321696) | ||
52 | 47 | - Use probe-and-enlist-hardware to enlist all virtual machine inside | ||
53 | 48 | a libvirt machine, allow password qemu+ssh connections. | ||
54 | 49 | (LP: #1315155, LP: #1315157) | ||
55 | 50 | - Rename ppc64el boot loader to PowerKVM (LP: #1315154) | ||
56 | 51 | * debian/control: | ||
57 | 52 | - Add missing dependency in maas-cluster-controller for python-pexpect | ||
58 | 53 | |||
59 | 54 | -- Julian Edwards <julian.edwards@canonical.com> Mon, 26 May 2014 10:56:33 +1000 | ||
60 | 55 | |||
61 | 56 | maas (1.5+bzr2252-0ubuntu1) trusty; urgency=medium | ||
62 | 57 | |||
63 | 58 | * New upstream release | ||
64 | 59 | - Add support to install Third Party Drivers. In order for this to be | ||
65 | 60 | used the user will have to go to the Settings page to enable the | ||
66 | 61 | installation of these drivers. (LP: #1305839) | ||
67 | 62 | - Use release images instead of daily. (LP: #1306701) | ||
68 | 63 | - Quote interface name in dhcpd.template, otherwise DHCP server fails | ||
69 | 64 | to start. (LP: #1306335) | ||
70 | 65 | - Fix IntegrityError, when multiple processes are trying to register | ||
71 | 66 | the same component. (LP: #1307415) | ||
72 | 67 | - Add missing armhf commissioning template (LP: #1307780) | ||
73 | 68 | * debian/maas-region-controller-min.install: Install drivers.yaml. | ||
74 | 69 | * debian/maas-region-controller.postinst: No longer show the | ||
75 | 70 | installation note by default. (LP: #1284652) | ||
76 | 71 | |||
77 | 72 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Apr 2014 19:02:00 -0400 | ||
78 | 73 | |||
79 | 74 | maas (1.5+bzr2236-0ubuntu1) trusty; urgency=medium | ||
80 | 75 | |||
81 | 76 | * New upstream bugfix release. | ||
82 | 77 | - Fix simplestreams path to use the new data source path. (LP: #1305118) | ||
83 | 78 | - Fix commissioning_distro_series validation failure. (LP: #1304408) | ||
84 | 79 | - Fix DB migration 0072_remove_ipmi_autodetec. (LP: #1302156) | ||
85 | 80 | - Update documentation. | ||
86 | 81 | * debian/maas-region-controller-min.maas-region-celery.upstart, | ||
87 | 82 | debian/maas-region-controller-min.maas-txlongpoll.upstart: Fix ISO | ||
88 | 83 | install by making sure rabbitmq user is really created if it does not | ||
89 | 84 | exist (LP: #1298559) | ||
90 | 85 | |||
91 | 86 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Apr 2014 18:36:55 -0400 | ||
92 | 87 | |||
93 | 88 | maas (1.5+bzr2230-0ubuntu1) trusty; urgency=medium | ||
94 | 89 | |||
95 | 90 | * New upstream bugfix release: | ||
96 | 91 | - Fix Cluster Controller to handle deprecated config items gracefull. | ||
97 | 92 | Otherwise it fails on upgrades. (LP: #1302772) | ||
98 | 93 | - Fix documentation generation and referencing. (LP: #1302956) | ||
99 | 94 | - Ensure we PXE boot when we turn on SM15K systems. (LP: #1303915) | ||
100 | 95 | |||
101 | 96 | -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 07 Apr 2014 10:26:51 -0400 | ||
102 | 97 | |||
103 | 98 | maas (1.5+bzr2227-0ubuntu1) trusty; urgency=medium | ||
104 | 99 | |||
105 | 100 | * New upstream bugfix release: | ||
106 | 101 | - Fix catching exceptions raised by | ||
107 | 102 | twisted.conch.ssh.keys.Key.fromString (LP: #1298788) | ||
108 | 103 | - Fix validationg in default NodeGroupInterface.broadcast_ip making it | ||
109 | 104 | optional. (LP: #1299374) | ||
110 | 105 | - Drop install-pxe-bootloader as it conflicts with newer import script. | ||
111 | 106 | - Remove references to old import script. | ||
112 | 107 | - Fix changes that cause overwriting of existing entries. | ||
113 | 108 | - Fix inappropriate ValidationError when defining networks with nested | ||
114 | 109 | (but non-identical) address ranges. (LP: #1299114) | ||
115 | 110 | - Fix issue where if a node does not provide an architecture type on dhcp | ||
116 | 111 | request, or no other boot method is available for that architecture, | ||
117 | 112 | the node still uses pxelinux.0 to boot. (LP: #1300285) | ||
118 | 113 | - Take an advisory lock to prevent concurrent creation of the | ||
119 | 114 | eventloops table. (LP: #1300363) | ||
120 | 115 | - Remove the cloud_images_archive setting, as it conflicts with new | ||
121 | 116 | import script. (LP: #1300587) | ||
122 | 117 | - Add a 'logout confirmation' page. Using this, the logout action is | ||
123 | 118 | protected against CSRF attacks because it uses a POST request, in | ||
124 | 119 | conjunction with Django's CSRF protection feature. (LP: #1298790) | ||
125 | 120 | - Fix cluster listings when dealing with large number of clusters by | ||
126 | 121 | paginating it. (LP: #1301242) | ||
127 | 122 | - Change list_boot_images() so that it can cope with a missing boot | ||
128 | 123 | images directory: this happens if the reporting task runs before the | ||
129 | 124 | images have been imported. (LP: #213984) | ||
130 | 125 | - Fix internal server error on fast path installer. (LP: #1293676) | ||
131 | 126 | - Fix uploading files using maas-cli. (LP: #1187826) | ||
132 | 127 | - Fix SM15k Invalid Power Control and Fix enlisting machines with | ||
133 | 128 | 2.0 api. (LP: #1302818, LP: #1302819) | ||
134 | 129 | |||
135 | 130 | [ Andres Rodriguez ] | ||
136 | 131 | * debian/maas-cluster-controller.install: Install UEFI templates | ||
137 | 132 | * debian/maas-cluster-controller.dirs: Create 'boot-resources' dir. | ||
138 | 133 | |||
139 | 134 | [ Jason Hobbs ] | ||
140 | 135 | * debian/extras/99-maas: Allow access to keyserver.ubuntu.com via | ||
141 | 136 | squid-deb-proxy. | ||
142 | 137 | |||
143 | 138 | [Jeroen Vermeulen] | ||
144 | 139 | * debian/maas-cluster-controller.postinst: | ||
145 | 140 | - Make the tgt config link point to the new boot-resources dir. | ||
146 | 141 | * debian/maas-region-controller-min.dirs: | ||
147 | 142 | - Don't create /var/lib/maas/tftp. | ||
148 | 143 | |||
149 | 144 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 03 Apr 2014 13:45:02 -0400 | ||
150 | 145 | |||
151 | 146 | maas (1.5+bzr2204-0ubuntu1) trusty; urgency=low | ||
152 | 147 | |||
153 | 148 | * New upstream release (LP: #1281881) | ||
154 | 149 | |||
155 | 150 | [ Andres Rodriguez ] | ||
156 | 151 | * debian/maas-region-controller-min.templates: Set installation note to false | ||
157 | 152 | by default. | ||
158 | 153 | * Check rabbitmqctl is present before running commands: | ||
159 | 154 | - debian/maas-region-controller-min.maas-region-celery.upstart. | ||
160 | 155 | - debian/maas-region-controller-min.maas-txlongpoll.upstart. | ||
161 | 156 | * make sure maas_longpoll rabbitmq user is created/with correct password on | ||
162 | 157 | a package reconfigure. | ||
163 | 158 | * debian/maas-dns.postinst: Fix upgrade setup of named.conf.options. | ||
164 | 159 | * debian/maas-cluster-controller.install: Install UEFI templates (LP: #1299143) | ||
165 | 160 | |||
166 | 161 | [ Julian Edwards ] | ||
167 | 162 | * debian/extas/maas: Echo warning to stderr so json stdout is not polluted | ||
168 | 163 | * debian/maas-cluster-controller.postinst: Run upgrade-cluster on each | ||
169 | 164 | upgrade | ||
170 | 165 | * debian/maas-dns.postinst: Call edit_named_options to add a line in | ||
171 | 166 | /etc/bind/named.conf.options that includes the | ||
172 | 167 | /etc/named/maas/named.conf.options.inside.maas file. | ||
173 | 168 | * debian/control: | ||
174 | 169 | - maas-dns depends on python-iscpy | ||
175 | 170 | - maas-cluster-controller depends on python-seamicroclient | ||
176 | 171 | * debian/maas-cluster-controller.install: Install bootresources.yaml | ||
177 | 172 | |||
178 | 173 | [ Dustin Kirkland ] | ||
179 | 174 | * debian/control: LP: #1297097 | ||
180 | 175 | - clean up package descriptions, modernize, and more clearly/simply | ||
181 | 176 | explain what each package does | ||
182 | 177 | - drop "Ubuntu" in front of MAAS, clean up command line/API description | ||
183 | 178 | |||
184 | 179 | -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 28 Mar 2014 10:43:53 -0400 | ||
185 | 180 | |||
186 | 181 | maas (1.5+bzr1977-0ubuntu1) trusty; urgency=low | ||
187 | 182 | |||
188 | 183 | * New upstream bugfix release. | ||
189 | 184 | - setup.py: Install missing shell snippet | ||
190 | 185 | |||
191 | 186 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 19 Feb 2014 16:31:45 -0500 | ||
192 | 187 | |||
193 | 188 | maas (1.5+bzr1976-0ubuntu1) trusty; urgency=low | ||
194 | 189 | |||
195 | 190 | * New upstream release. | ||
196 | 191 | * debian/maas-cluster-controller.postinst: Make sure upgrades handle | ||
197 | 192 | authbind upgrades too. | ||
198 | 193 | |||
199 | 194 | -- Andres Rodriguez <andreserl@ubuntu.com> Sun, 16 Feb 2014 22:56:36 -0500 | ||
200 | 195 | |||
201 | 196 | maas (1.5+bzr1951-0ubuntu1) trusty; urgency=low | ||
202 | 197 | |||
203 | 198 | * New upstream release | ||
204 | 199 | * debian/maas-cluster-controller.postinst: Also authbind port 69. | ||
205 | 200 | * debian/maas-cluster-controller.maas-pserv.upstart: Export MAAS_URL. | ||
206 | 201 | |||
207 | 202 | -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 16:16:38 -0500 | ||
208 | 203 | |||
209 | 204 | maas (1.5+bzr1948-0ubuntu2) trusty; urgency=low | ||
210 | 205 | |||
211 | 206 | * debian/maas-cluster-controller.postinst: Make sure generator on | ||
212 | 207 | pserv.yaml is updated on upgrade or reconfigure. (LP: #1273197) | ||
213 | 208 | * debian/maas-cluster-controller.maas-pserv.upstart: Make sure maas-pserv | ||
214 | 209 | is started with authbind. | ||
215 | 210 | |||
216 | 211 | -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 13:55:20 -0500 | ||
217 | 212 | |||
218 | 213 | maas (1.5+bzr1948-0ubuntu1) trusty; urgency=low | ||
219 | 214 | |||
220 | 215 | * New upstream release. | ||
221 | 216 | |||
222 | 217 | [ Graham Binns ] | ||
223 | 218 | * debian/control: Depends on python-jsonschema. | ||
224 | 219 | |||
225 | 220 | [ Andres Rodriguez ] | ||
226 | 221 | * debian/maas-region-controller-min.posinst: Make txlongpoll.yaml only | ||
227 | 222 | readable by the app and not world readeable. | ||
228 | 223 | * debian/patches/02-pserv-config.patch: Refreshed. | ||
229 | 224 | |||
230 | 225 | [ Julian Edwards ] | ||
231 | 226 | * debian/extras/maas-cli renamed to debian/extras/maas, and introduce | ||
232 | 227 | a deprecation warning in favour of using maas over maas-cli. | ||
233 | 228 | * debian/extras/maas renamed to debian/extras/maas-region-admin | ||
234 | 229 | * debian/maas-cli.install: install debian/extras/maas | ||
235 | 230 | * debian/maas-dns.postinst: Invoke maas-region-admin instead of maas | ||
236 | 231 | * debian/maas-region-controller-min.install: install maas-region-admin | ||
237 | 232 | instead of maas | ||
238 | 233 | * debian/maas-region-controller.postinst: Invoke maas-region-admin instead | ||
239 | 234 | of maas | ||
240 | 235 | * debian/maas-cli.links: Link from maas to maas-cli for backward compat. | ||
241 | 236 | |||
242 | 237 | [ Seth Arnold ] | ||
243 | 238 | * debian/maas-region-controller-min.postinst: Make sure txlongpoll.yaml | ||
244 | 239 | gets correct permissions on upgrade (LP: #1254034) | ||
245 | 240 | |||
246 | 241 | -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 12:08:23 -0500 | ||
247 | 242 | |||
248 | 243 | maas (1.5+bzr1909-0ubuntu1) trusty; urgency=low | ||
249 | 244 | |||
250 | 245 | * New upstream release. | ||
251 | 246 | |||
252 | 247 | [ Dustin Kirkland ] | ||
253 | 248 | * debian/maas-region-controller-min.postinst: Fix typo in sed. Remove | ||
254 | 249 | double quotes. (LP: #1274448) | ||
255 | 250 | |||
256 | 251 | [ Andres Rodriguez ] | ||
257 | 252 | * debian/control: Add depends on python-crochet. | ||
258 | 253 | * Get rid of dfsg on the versioning as we no longer strip any code from | ||
259 | 254 | the orig tarball. | ||
260 | 255 | - debian/rules: Do not strip any files out of the tarball. | ||
261 | 256 | * debian/patches/*: Refreshed. | ||
262 | 257 | |||
263 | 258 | -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 31 Jan 2014 09:38:51 -0500 | ||
264 | 259 | |||
265 | 260 | maas (1.4+bzr1853+dfsg-0ubuntu1) trusty; urgency=low | ||
266 | 261 | |||
267 | 262 | * New upstream release | ||
268 | 263 | |||
269 | 264 | -- Dustin Kirkland <kirkland@ubuntu.com> Tue, 28 Jan 2014 08:41:41 +0000 | ||
270 | 265 | |||
271 | 266 | maas (1.4+bzr1849+dfsg-0ubuntu1) trusty; urgency=low | ||
272 | 267 | |||
273 | 268 | * New upstream release. | ||
274 | 269 | |||
275 | 270 | [ Gavin Panella ] | ||
276 | 271 | * debian/control: Remove all dependencies on Avahi and DBUS. | ||
277 | 272 | |||
278 | 273 | -- Julian Edwards <julian.edwards@canonical.com> Tue, 28 Jan 2014 17:12:22 +1000 | ||
279 | 274 | |||
280 | 275 | maas (1.4+bzr1820+dfsg-0ubuntu1) trusty; urgency=low | ||
281 | 276 | |||
282 | 277 | * New upstream Release. | ||
283 | 278 | |||
284 | 279 | [ Jeroen Vermeulen ] | ||
285 | 280 | * Move maas-probe-dhcp from maas-dhcp to python-maas-provisioningserver. | ||
286 | 281 | |||
287 | 282 | [ Andres Rodriguez ] | ||
288 | 283 | * debian/maas-region-controller.postinst: Make sure maas-txlongpoll and | ||
289 | 284 | maas-region-celery get restarted. | ||
290 | 285 | * debian/control: | ||
291 | 286 | - python-maas-provisioningserver Breaks/Replaces for maas-dhcp due to | ||
292 | 287 | moving files around packages. | ||
293 | 288 | - Suggests ipmitool, libvirt-bin, amtterm. | ||
294 | 289 | |||
295 | 290 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 15 Jan 2014 00:24:58 -0500 | ||
296 | 291 | |||
297 | 292 | maas (1.4+bzr1817+dfsg-0ubuntu1) trusty; urgency=low | ||
298 | 293 | |||
299 | 294 | * New upstream release | ||
300 | 295 | |||
301 | 296 | [ Andres Rodriguez ] | ||
302 | 297 | * debian/maas-dns.postinst: Drop write_dns_config as this is run by | ||
303 | 298 | celery jobs. | ||
304 | 299 | * debian/maas-region-controller.templates: Rename template to | ||
305 | 300 | maas-region-controller-min.templates | ||
306 | 301 | * debian/control: Depends on python-amqp; Conflicts on python-librabbitmq. | ||
307 | 302 | |||
308 | 303 | [ Julian Edwards ] | ||
309 | 304 | * New maas-probe-dhcp script to detect DHCP servers | ||
310 | 305 | - debian/extras/maas-probe-dhcp: New script | ||
311 | 306 | - debian/maas-dhcp.install: Install new maas-probe-dhcp script | ||
312 | 307 | - maas-dhcp.lintian-overrides: New maas-probe-dhcp script has no manpage | ||
313 | 308 | |||
314 | 309 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 15 Jan 2014 00:23:44 -0500 | ||
315 | 310 | |||
316 | 311 | maas (1.4+bzr1789+dfsg-0ubuntu1) trusty; urgency=low | ||
317 | 312 | |||
318 | 313 | * New upstream release | ||
319 | 314 | |||
320 | 315 | [ Jeroen Vermeulen ] | ||
321 | 316 | * Keep legacy import_ephemerals config for now. | ||
322 | 317 | |||
323 | 318 | [ Andres Rodriguez ] | ||
324 | 319 | * debian/maas-region-controller.postinst: Allo default-maas-url debconf | ||
325 | 320 | option to be preseeded. | ||
326 | 321 | * Make use of authbind to allow maas-cluster-celery bind port as non-root. | ||
327 | 322 | - debian/control: Depends on authbind for maas-cluster-controller. | ||
328 | 323 | - debian/maas-cluster-controller.{postinst,postrm}: Handle creation | ||
329 | 324 | and removal of required authbind file. | ||
330 | 325 | * Split maas-region-controller into maas-region-controller-min. | ||
331 | 326 | - debian/maas-region-controller-min.{postinst,postrm,prerm}: Handle | ||
332 | 327 | basic configuration for rsyslogd, squid-deb-proxy, and maas-url. | ||
333 | 328 | - debian/control: Depends on maas-region-controller-min, postgresql | ||
334 | 329 | and rabbitmq-server for maas-region-controller. | ||
335 | 330 | |||
336 | 331 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 10 Oct 2013 17:07:51 -0400 | ||
337 | 332 | |||
338 | 333 | maas (1.4+bzr1693+dfsg-0ubuntu1) saucy; urgency=low | ||
339 | 334 | |||
340 | 335 | * New Upstream Release (LP: #1218526) | ||
341 | 336 | - This new upstream release contains fixes and improvements of the | ||
342 | 337 | features approved by the FFe above. | ||
343 | 338 | - Fixes commissioning failure on Saucy with 'Failed Test' (LP: #1237364) | ||
344 | 339 | - Fixes access of static images over http (LP: #1236544) | ||
345 | 340 | * d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544) | ||
346 | 341 | * d/control: Bump depends on python-django to 1.4. (LP: #1236572) | ||
347 | 342 | * d/maas-dhcp.postinst: Fail gracefully if apparmor_parser fails, allowing | ||
348 | 343 | to install maas-dhcp during an ISO install. (LP: #1236786) | ||
349 | 344 | |||
350 | 345 | -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 04 Oct 2013 12:33:05 -0400 | ||
351 | 346 | |||
352 | 347 | maas (1.4+bzr1656+dfsg-0ubuntu2) saucy; urgency=low | ||
353 | 348 | |||
354 | 349 | * debian/control: Recommends on maas-dns instead of Depends for region | ||
355 | 350 | because maas-dns needs the region installed first. | ||
356 | 351 | |||
357 | 352 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 03 Oct 2013 10:36:20 -0400 | ||
358 | 353 | |||
359 | 354 | maas (1.4+bzr1656+dfsg-0ubuntu1) saucy; urgency=low | ||
360 | 355 | |||
361 | 356 | [ Andres Rodriguez ] | ||
362 | 357 | * New upstream bugfix release. | ||
363 | 358 | - Respect filters for ephemerals_script.py. | ||
364 | 359 | * debian/control: Depends on ubuntu-cloudimage-keyring instead of | ||
365 | 360 | ubuntu-cloud-keyring; depends on python-distro-info. | ||
366 | 361 | * debian/control: Remove suggests on maas-dhcp and maas-dns as they are | ||
367 | 362 | now dependencies. | ||
368 | 363 | |||
369 | 364 | [ Scott Moser ] | ||
370 | 365 | * debian/control: Bump depends on isc-dhcp-server to 4.2.4 | ||
371 | 366 | * debian/maas-dhcp.maas-dhcp-server.upstart: Change ownership of leases | ||
372 | 367 | file to root:root, and run the daemon as dhcpd:dhcpd. | ||
373 | 368 | |||
374 | 369 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 01 Oct 2013 15:26:34 -0400 | ||
375 | 370 | |||
376 | 371 | maas (1.4+bzr1655+dfsg-0ubuntu1) saucy; urgency=low | ||
377 | 372 | |||
378 | 373 | * New Upstream release. (LP: #1218526) | ||
379 | 374 | * debian/control: | ||
380 | 375 | - Depends on python-djorm-ext-pgarray, python-curtin, | ||
381 | 376 | python-simplestreams, ubuntu-cloud-keyring. | ||
382 | 377 | - Depends on maas-dns, maas-dhcp to get them seeded and | ||
383 | 378 | into main (LP: #1227353) | ||
384 | 379 | |||
385 | 380 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 28 Aug 2013 11:17:44 -0400 | ||
386 | 381 | |||
387 | 382 | maas (1.4+bzr1551+dfsg-0ubuntu1) saucy; urgency=low | ||
388 | 383 | |||
389 | 384 | * New upstream release | ||
390 | 385 | |||
391 | 386 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Aug 2013 16:20:41 -0400 | ||
392 | 387 | |||
393 | 388 | maas (1.4+bzr1548+dfsg-0ubuntu1) saucy; urgency=low | ||
394 | 389 | |||
395 | 390 | * New upstream release | ||
396 | 391 | |||
397 | 392 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 18 Jul 2013 10:15:10 -0400 | ||
398 | 393 | |||
399 | 394 | maas (1.4+bzr1539+dfsg-0ubuntu1) saucy; urgency=low | ||
400 | 395 | |||
401 | 396 | * New upstream release | ||
402 | 397 | * Symlink apache2 config into /etc/apache2/conf-enabled/ instead of | ||
403 | 398 | /etc/apache2/conf.d as apache2.4 no longer supports the latter. | ||
404 | 399 | - debian/maas-cluster-controller.{postinst,postrm} | ||
405 | 400 | - debian/maas-region-controller.{postinst,postrm} | ||
406 | 401 | * debian/control: Bump Standards-Version to 3.9.4. | ||
407 | 402 | * debian/maas-cluster-controller.lintian-overrides: Remove unneeded | ||
408 | 403 | override and add a new one. | ||
409 | 404 | * debian/maas-region-controller.lintian-overrides: Add extra overrides. | ||
410 | 405 | |||
411 | 406 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 03 Jul 2013 17:11:02 -0400 | ||
412 | 407 | |||
413 | 408 | maas (1.4+bzr1538+dfsg-0ubuntu1) saucy; urgency=low | ||
414 | 409 | |||
415 | 410 | * New upstream release | ||
416 | 411 | * debian/patches/04-setup-dont-user-list-snippets.patch: Drop. Merged | ||
417 | 412 | Upstream. | ||
418 | 413 | |||
419 | 414 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 13 Jun 2013 20:06:35 -0400 | ||
420 | 415 | |||
421 | 416 | maas (1.4+bzr1527+dfsg-0ubuntu1) saucy; urgency=low | ||
422 | 417 | |||
423 | 418 | * debian/patches/04-setup-dont-user-list-snippets.patch: Drop importing | ||
424 | 419 | maasserver modules to list snippets in favor to using glob. Otherwise | ||
425 | 420 | we would have to add various non necessary Build-Dependencies. | ||
426 | 421 | |||
427 | 422 | [ Jeroen Vermeulen ] | ||
428 | 423 | * Install templates into /etc/maas/templates/. | ||
429 | 424 | |||
430 | 425 | -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 03 Jun 2013 17:59:31 -0400 | ||
431 | 426 | |||
432 | 427 | maas (1.4+bzr1505+dfsg-0ubuntu1) saucy; urgency=low | ||
433 | 428 | |||
434 | 429 | * New upstream release | ||
435 | 430 | |||
436 | 431 | [ Steve Langasek ] | ||
437 | 432 | * Add missing dependency on iproute to maas-region-controller, for use of | ||
438 | 433 | /sbin/ip in postinst. | ||
439 | 434 | |||
440 | 435 | [ Julian Edwards ] | ||
441 | 436 | * debian/maas-dhcp.maas-dhcp-server.upstart: | ||
442 | 437 | - Detect 12.04 as the host OS and install with correct permissions. This | ||
443 | 438 | allows the same packaging to be used in the 12.04 backport. | ||
444 | 439 | |||
445 | 440 | [ Andres Rodriguez ] | ||
446 | 441 | * Update packaging to support FPI: | ||
447 | 442 | - debian/control: Depends on apache2 for maas-cluster-controller. | ||
448 | 443 | - debian/maas-cluster-controller.install: Install http config file. | ||
449 | 444 | - debian/maas-cluster-controller.{postinst,postrm}: Handle symlink creation | ||
450 | 445 | and deletion. | ||
451 | 446 | * debian/maas-region-controller.install: Install preseeds in | ||
452 | 447 | etc/maas/preseeds. (LP: #1073463) | ||
453 | 448 | |||
454 | 449 | [ Jeroen Vermeulen ] | ||
455 | 450 | * In the source tree, /etc/maas/pserv.yaml has moved from etc/ to etc/maas/. | ||
456 | 451 | * Install templates into /etc/maas/templates/. | ||
457 | 452 | |||
458 | 453 | -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 03 Jun 2013 16:53:14 -0400 | ||
459 | 454 | |||
460 | 455 | maas (1.3+bzr1455+dfsg-0ubuntu1) raring; urgency=low | ||
461 | 456 | |||
462 | 457 | * New upstream bugfix release. | ||
463 | 458 | - Fixes and returns the 'resource_url' with the 'canonical' url for | ||
464 | 459 | a file that is fetched using the API (LP: #1154142) | ||
465 | 460 | |||
466 | 461 | [ Andres Rodriguez ] | ||
467 | 462 | * debian/control: | ||
468 | 463 | - Change Conflicts/Replaces for Breaks/Replaces. | ||
469 | 464 | - Conflicts on tftpd-hpa and dnsmasq. | ||
470 | 465 | - Do not pre-depends, but Depends on ${misc:Depends} for 'maas'. | ||
471 | 466 | |||
472 | 467 | [ Steve Langasek ] | ||
473 | 468 | * postinst scripts are never called with 'reconfigure' as the script | ||
474 | 469 | argument. Remove references to this (mythical) invocation. | ||
475 | 470 | * always call 'set -e' from maintainer scripts instead of passing 'sh -e' | ||
476 | 471 | as the interpreter, so that scripts will behave correctly when run via | ||
477 | 472 | 'sh -x'. | ||
478 | 473 | * invoke-rc.d is never allowed to not exist - simplify scripts (and make | ||
479 | 474 | them better policy-compliant) by invoking unconditionally. (The only | ||
480 | 475 | possible exception is in the postrm, where it's *theoretically* possible | ||
481 | 476 | for invoke-rc.d to be missing if the user has completely stripped | ||
482 | 477 | down their system; that's a fairly unreasonable corner case, but we | ||
483 | 478 | might as well be correct if it ever happens.) | ||
484 | 479 | * db_get+db_set is a no-op; don't call db_set to push back a value we just | ||
485 | 480 | got from db_get. | ||
486 | 481 | * Omit superfluous calls to 'exit 0' at the end of each script. | ||
487 | 482 | * Remove maas-cluster-controller prerm script, which called debconf for no | ||
488 | 483 | reason. | ||
489 | 484 | * Don't invoke debconf in the postrm script either, debhelper already does | ||
490 | 485 | this for us. | ||
491 | 486 | * Other miscellaneous maintainer script fixes | ||
492 | 487 | * debian/maas-common.postinst: call adduser and addgroup unconditionally; | ||
493 | 488 | the tools are already designed to DTRT, we don't need to check for the | ||
494 | 489 | user/group existence before calling them nor should we worry about | ||
495 | 490 | calling them only once on first install. | ||
496 | 491 | * debian/maas-common.postrm: delete the maas group, not just the user, | ||
497 | 492 | as the comment in the code implies we should do. | ||
498 | 493 | |||
499 | 494 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 19 Mar 2013 15:38:22 -0400 | ||
500 | 495 | |||
501 | 496 | maas (1.3+bzr1452+dfsg-0ubuntu1) raring; urgency=low | ||
502 | 497 | |||
503 | 498 | * New upstream release. | ||
504 | 499 | - MAAS file storage mechanism is shifting from a single shared | ||
505 | 500 | namespace to a per-user namespace. Operators of the majority | ||
506 | 501 | of MAAS systems will not notice any change. However, operators | ||
507 | 502 | of the most complex installations may find that a new | ||
508 | 503 | "shared-environment" user is created, and that some resources | ||
509 | 504 | are reassigned to it, such as API credentials and SSH public | ||
510 | 505 | keys. This provides a transitional environment that mimics the | ||
511 | 506 | behaviour of a shared namespace. | ||
512 | 507 | |||
513 | 508 | [ Raphaël Badin ] | ||
514 | 509 | * debian/control: maas-region-controller depends on bind9utils. | ||
515 | 510 | (LP: #1103195) | ||
516 | 511 | * debian/maas-dns.postinst: Call write_dns_config. | ||
517 | 512 | (LP: #1085865). | ||
518 | 513 | * debian/maas-cluster-controller.postinst: Fix the name of the config | ||
519 | 514 | file (/etc/maas/pserv.yaml and not /etc/maas/pserv.conf) | ||
520 | 515 | (LP: #1083542). | ||
521 | 516 | * debian/extras/99-maas-sudoers: Add 'SETENV:' to sudo rule | ||
522 | 517 | to allow preserving the environment when running | ||
523 | 518 | /usr/sbin/maas-import-pxe-files via sudo. | ||
524 | 519 | * debian/maas-dns.postinst: fix permissions and group ownership of | ||
525 | 520 | file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935) | ||
526 | 521 | * debian/control: Remove the dependency of maas-cluster-controller | ||
527 | 522 | on rabbitmq-server. (LP: #1072744) | ||
528 | 523 | * debian/extras/99-maas-sudoers: Add sudo rule for script | ||
529 | 524 | /usr/sbin/maas-import-pxe-files. | ||
530 | 525 | * debian/maas-cluster-controller.install: Removed commissioning-user-data | ||
531 | 526 | script. | ||
532 | 527 | |||
533 | 528 | [ Julian Edwards ] | ||
534 | 529 | * debian/maas-region-controller.install: Remove installation of maas-gc; it | ||
535 | 530 | is no longer required as upstream no longer stores files in the filesystem. | ||
536 | 531 | (LP: #1069734) | ||
537 | 532 | * debian/maas-cluster-controller.postinst: Ensure that /etc/maas/pserv.yaml | ||
538 | 533 | is updated when reconfiguring. (LP: #1081212) | ||
539 | 534 | |||
540 | 535 | [ Jeroen Vermeulen ] | ||
541 | 536 | * debian/maas-cluster-controller.install: Install import scripts. | ||
542 | 537 | * debian/maas-cluster-controller.postinst: Configure tgt (the iSCSI server) | ||
543 | 538 | so the import script can install files to it. | ||
544 | 539 | * debian/maas-cluster-controller.postrm: Clean up tgt config. | ||
545 | 540 | * debian/maas-region-controller.install: Move import scripts out to the | ||
546 | 541 | cluster controller, and drop the maas-import-isos compatibility script. | ||
547 | 542 | * debian/maas-region-controller.postinst: Remove tgt config. | ||
548 | 543 | * debian/maas-region-controller.postrm: Remove tgt config cleanup. | ||
549 | 544 | * Bump code revision to include latest user_data.template fixes. | ||
550 | 545 | |||
551 | 546 | [ Gavin Panella ] | ||
552 | 547 | * debian/extras/99-maas: squashfs image download is no longer needed. | ||
553 | 548 | * debian/maas-cluster-controller.install: maas-import-squashfs and its | ||
554 | 549 | configuration file are no longer part of upstream. | ||
555 | 550 | * debian/maas-cluster-controller.install: The maas-import-pxe-files cron | ||
556 | 551 | task is no longer used. | ||
557 | 552 | * debian/maas-cluster-controller.postinst: Remove leading comment | ||
558 | 553 | markers from the 'generator' line in pserv.yaml. | ||
559 | 554 | |||
560 | 555 | [ Andres Rodriguez ] | ||
561 | 556 | * debian/control: | ||
562 | 557 | - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028) | ||
563 | 558 | - maas-dns: Conflicts with dnsmasq | ||
564 | 559 | - maas-cluster-controller Conflicts/Replaces maas-region-controller as | ||
565 | 560 | import scripts are no longer shipped in the region. | ||
566 | 561 | - debian/control: Depends on distro-info for maas-cluster-controller | ||
567 | 562 | instead of maas-region-controller (LP: #1103194) | ||
568 | 563 | * debian/maas-cluster-controller.config: If URL has been detected, | ||
569 | 564 | add /MAAS if it doesn't contain it. This helps upgrades from versions | ||
570 | 565 | where DEFAULT_MAAS_URL didn't use /MAAS. | ||
571 | 566 | |||
572 | 567 | -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 04 Mar 2013 11:49:44 -0500 | ||
573 | 568 | |||
574 | 569 | maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low | ||
575 | 570 | |||
576 | 571 | * New upstream bugfix release | ||
577 | 572 | - Fixes commissioning failing to set memory attribute. (LP: #1064638) | ||
578 | 573 | - Fixes node listing by adding pagination (LP: #1064672) | ||
579 | 574 | - Changes default bind rndc key which breaks initscripts (LP: #1066938) | ||
580 | 575 | - Fixes invalid DNS config once node is enlisted (LP: #1066958) | ||
581 | 576 | - Reference documentation link to correct URL (LP: #1067261) | ||
582 | 577 | |||
583 | 578 | [ Andres Rodriguez ] | ||
584 | 579 | * debian/rules: Change upstream branch. | ||
585 | 580 | |||
586 | 581 | [ Gavin Panella ] | ||
587 | 582 | * debian/maas-dns.postinst: Remove MAAS-related include lines from named's | ||
588 | 583 | config before adding a new one (LP: #1066929) | ||
589 | 584 | |||
590 | 585 | [ Raphael Badin ] | ||
591 | 586 | * debian/extras/maas-region-celeryd: Remove whitespace that affects DNS | ||
592 | 587 | rabbitmq queue. (LP: #1067929) | ||
593 | 588 | |||
594 | 589 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 16 Oct 2012 10:31:37 -0400 | ||
595 | 590 | |||
596 | 591 | maas (0.1+bzr1264+dfsg-0ubuntu2) quantal; urgency=low | ||
597 | 592 | |||
598 | 593 | * Fix MAAS not working after CD/preseed install (LP: #1065763) | ||
599 | 594 | - debian/extras/maas-region-celeryd: Add wrapper to run celery from | ||
600 | 595 | the upstart job. | ||
601 | 596 | - debian/extras/maas-region-controller.maas-region-celery.upstart: Create | ||
602 | 597 | rabbitmq user if it does not exists. | ||
603 | 598 | * debian/control: Remove unneeded deps on python-txtftp for some binary pkgs. | ||
604 | 599 | * debian/maas-region-controller.postinst: Minor fix referencing variable. | ||
605 | 600 | |||
606 | 601 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 11 Oct 2012 17:38:08 -0400 | ||
607 | 602 | |||
608 | 603 | maas (0.1+bzr1264+dfsg-0ubuntu1) quantal; urgency=low | ||
609 | 604 | |||
610 | 605 | * New upstream release. | ||
611 | 606 | |||
612 | 607 | [ Raphaël Badin ] | ||
613 | 608 | * debian/maas-region-controller.postinst: Enable proxy_http module. | ||
614 | 609 | * debian/maas-cluster-controller.postinst: Create /var/lib/maas. (LP: #1065062) | ||
615 | 610 | |||
616 | 611 | [ Andres Rodriguez ] | ||
617 | 612 | * Install maas-provision with python-maas-provisioningserver (LP: #1065171): | ||
618 | 613 | - debian/python-maas-provisioningserver.install: Install | ||
619 | 614 | - debian/control: Add Conflicts/Replaces with maas-cluster-controller | ||
620 | 615 | to handle upgrades. | ||
621 | 616 | * debian/patches/04-fix-ipmi-enlistment.patch: Drop. Merged Upstream. | ||
622 | 617 | * debian/control: Depends on maas-region-controller for maas-dns. | ||
623 | 618 | * debian/maas-region-controller.postinst: Set the correct host for | ||
624 | 619 | BROKER_URL (LP: #1065080) | ||
625 | 620 | * Handle creation of user/group in maas-common. | ||
626 | 621 | * debian/maas-region-controller.config: Always source dbconfig scripts. | ||
627 | 622 | |||
628 | 623 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Oct 2012 11:17:21 -0400 | ||
629 | 624 | |||
630 | 625 | maas (0.1+bzr1243+dfsg-0ubuntu3) quantal; urgency=low | ||
631 | 626 | |||
632 | 627 | * 04-fix-ipmi-enlistment.patch: retry maas-enlist without power parameters | ||
633 | 628 | on failure. This allows enlistment to continue working with Precise | ||
634 | 629 | ephemeral images before the Precise SRU for maas-enlist lands. | ||
635 | 630 | (LP: #1064922). | ||
636 | 631 | |||
637 | 632 | -- Robie Basak <robie.basak@canonical.com> Wed, 10 Oct 2012 13:29:16 +0000 | ||
638 | 633 | |||
639 | 634 | maas (0.1+bzr1243+dfsg-0ubuntu2) quantal; urgency=low | ||
640 | 635 | |||
641 | 636 | * debian/patches/99-ipmi-user-too-long.patch: Fix username too long for | ||
642 | 637 | IPMI user created on enlistment (LP: #1064832) | ||
643 | 638 | |||
644 | 639 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Oct 2012 01:00:29 -0400 | ||
645 | 640 | |||
646 | 641 | maas (0.1+bzr1243+dfsg-0ubuntu1) quantal; urgency=low | ||
647 | 642 | |||
648 | 643 | * New upstream release. (LP: #1064596) | ||
649 | 644 | * debian/patches/99-temporary-fix-constraints.patch: Dropped. | ||
650 | 645 | * debian/control: | ||
651 | 646 | - ${python:Depends} for maas-common. | ||
652 | 647 | - Add missing Depends for python-maas-provisioningserver (LP: #1064542) | ||
653 | 648 | * debian/maas-cluster-controller.postinst: Create /var/log/maas if it | ||
654 | 649 | doesn't exist (LP: #1064539) | ||
655 | 650 | |||
656 | 651 | -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 08 Oct 2012 17:02:56 -0400 | ||
657 | 652 | |||
658 | 653 | maas (0.1+bzr1223+dfsg-0ubuntu1) quantal; urgency=low | ||
659 | 654 | |||
660 | 655 | * New upstream release. (LP: #1062518) | ||
661 | 656 | |||
662 | 657 | [ Julian Edwards ] | ||
663 | 658 | * Split packaging of 'maas' into maas-{region,cluster}-controller | ||
664 | 659 | - debian/control: Update accordingly. | ||
665 | 660 | - debian/*.install: Move files accordingly | ||
666 | 661 | - debian/*.{postinst,postrm,preinst}: Move files accordingly. | ||
667 | 662 | * Ensure isc-dhcp-server is disabled when installing maas-dhcp. | ||
668 | 663 | * Ensure maas-dns creates the maas user before trying to chown files. | ||
669 | 664 | * Make maas-cluster-controller autoconfigure itself when upgrading from the | ||
670 | 665 | old maas package. (LP: #1059416) | ||
671 | 666 | * Add missing prerm file for maas-cluster-controller so that .pyc files | ||
672 | 667 | are cleaned up. (LP: #1059973) | ||
673 | 668 | |||
674 | 669 | [ Raphaël Badin ] | ||
675 | 670 | * Install maas_local_celeryconfig.py in /etc/maas and symlink to | ||
676 | 671 | /usr/share/maas. | ||
677 | 672 | * debian/maas.postinst: Create rabbitmq celery user/vhost. | ||
678 | 673 | * debian/maas.postinst: Update BROKER_URL in maas_local_celeryconfig.py. | ||
679 | 674 | * Use maas_local_celeryconfig_cluster.py as the local celery | ||
680 | 675 | configuration file for the cluster worker. | ||
681 | 676 | * debian/maas-region-controller.maas-region-celery.upstart: Add region | ||
682 | 677 | worker upstart script. | ||
683 | 678 | * Rename cluster worker upstart script into | ||
684 | 679 | maas-cluster-controller.maas-clluster-celery.upstart. | ||
685 | 680 | * maas-cluster-controller.maas-celery.upstart: use "celeryconfig_cluster" | ||
686 | 681 | as the Celery config module. | ||
687 | 682 | * debian/maas-common.install: Install celeryconfig_common.py. | ||
688 | 683 | * debian/maas-cluster-controller.install: Install celeryconfig_cluster.py. | ||
689 | 684 | * debian/maas-region-controller.install: Install celeryconfig.py. | ||
690 | 685 | * Split celery config into cluster and region configs. | ||
691 | 686 | * Add region celeryd upstart config. | ||
692 | 687 | * Define CELERY_CONFIG_MODULE in | ||
693 | 688 | maas-cluster-controller.maas-cluster-celery.upstart | ||
694 | 689 | |||
695 | 690 | [ Jeroen Vermeulen ] | ||
696 | 691 | * Make maas_local_celery_config.py non-world readable. | ||
697 | 692 | * Make maas_local_celeryconfig_cluster.py non-world readable. | ||
698 | 693 | * Set root:maas ownership of local cluster config only *after* | ||
699 | 694 | the maas user/group have been created | ||
700 | 695 | |||
701 | 696 | [ Andres Rodriguez ] | ||
702 | 697 | * debian/maas.postinst: | ||
703 | 698 | - Always restart apache2. | ||
704 | 699 | - Handle upgrades for new upstream release. | ||
705 | 700 | - Handle upgrades for celery rabbitmq worker. | ||
706 | 701 | * Add binary package to install client tool. | ||
707 | 702 | - debian/extras/maas-cli: Add binary. | ||
708 | 703 | - debian/maas-cli.install: Add. Install maascli and apiclient. | ||
709 | 704 | - debian/control: Add binary package. | ||
710 | 705 | * debian/control: | ||
711 | 706 | - Depends on freeipmi-tools instead of ipmitool. | ||
712 | 707 | - Conflicts/Replaces on maas for python-maas-client. | ||
713 | 708 | - Depends on python-netifaces, python-lxml. | ||
714 | 709 | * Add python-maas-client binary package: | ||
715 | 710 | - debian/python-maas-client.install: Add. Install 'apiclient' python module. | ||
716 | 711 | - debian/control: Add package. python-django-maas and maas-cli now | ||
717 | 712 | Depend on it. | ||
718 | 713 | * debian/rules: Install maas-dhcp-server upstart job. | ||
719 | 714 | * debian/maas.postrm: Remove celery worker rabbitmq user and host. | ||
720 | 715 | * debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job | ||
721 | 716 | instead of isc-dhcp-server (LP: #1055951) | ||
722 | 717 | * debian/maas-region-controller.postinst: Cleanup upgrade rules. | ||
723 | 718 | * debian/maas-cluster-controller.postinst: Fix 'local' usage. | ||
724 | 719 | * debian/maas-common.install: Install celeryconfig in appropriate location. | ||
725 | 720 | * debian/maas-cluster-controller.postrm: Add and delete maas user. | ||
726 | 721 | * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server. | ||
727 | 722 | * debian/maas-region-controller.postinst: | ||
728 | 723 | - Always update passwords on upgrade. No longer check versioning. (LP: #1060094). | ||
729 | 724 | - Add MAAS server to allowed mirror in squid-deb-proxy | ||
730 | 725 | - Source dbconfig conf file for maas-region-controller on upgrade because | ||
731 | 726 | it writes a new config file and no longer preservers the previous password. | ||
732 | 727 | * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}. | ||
733 | 728 | * debian/maas-region-controller.install: Install maas-import-squashfs | ||
734 | 729 | * Handle removal of non existant files (LP: #1059556): | ||
735 | 730 | - debian/maintscript: Added to handle removal of conffiles. | ||
736 | 731 | - debian/control: Add Pre-depends and bump debhelper version. | ||
737 | 732 | * update po files for the templates. | ||
738 | 733 | * debian/extras/99-maas: Install in usr/share/maas/conf and symlink to the | ||
739 | 734 | appropriate etc dir. | ||
740 | 735 | * debian/maas-cluster-controller.config: Source debconf at the beginning of the | ||
741 | 736 | script. (LP: #1063857) | ||
742 | 737 | * debian/patches/99-temporary-fix-constraints.patch: Fix constraints maaping | ||
743 | 738 | when deploying with juju. Temporary until it gets merged upstream | ||
744 | 739 | |||
745 | 740 | [ Robie Basak ] | ||
746 | 741 | * Add maas-cluster-controller dependency on uuid-runtime, needed for uuidgen | ||
747 | 742 | by postinst. | ||
748 | 743 | |||
749 | 744 | [ Scott Moser ] | ||
750 | 745 | * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into | ||
751 | 746 | /etc/apparmor.d/dhcpd.d (LP: #1049177), and update apparmor profile for | ||
752 | 747 | /usr/sbin/dhcpd on install/remove | ||
753 | 748 | * get the ip address for the dhcp server in config | ||
754 | 749 | |||
755 | 750 | [ Diogo Matsubara ] | ||
756 | 751 | * Add initial tests to be run by autotests: | ||
757 | 752 | - debian/control: XS-Testsuite: autopkgtest | ||
758 | 753 | - debian/tests/control: Add | ||
759 | 754 | - debian/tests/maas-package-test: Add | ||
760 | 755 | - tests/maas-integration.py: Add | ||
761 | 756 | |||
762 | 757 | -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 08 Oct 2012 13:10:23 -0400 | ||
763 | 758 | |||
764 | 759 | maas (0.1+bzr971+dfsg-0ubuntu2) quantal; urgency=low | ||
765 | 760 | |||
766 | 761 | * debian/extras/99-maas-sudoers: Add missing rule for | ||
767 | 762 | maas-provision. (LP: #1046397) | ||
768 | 763 | |||
769 | 764 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 05 Sep 2012 12:36:58 -0400 | ||
770 | 765 | |||
771 | 766 | maas (0.1+bzr971+dfsg-0ubuntu1) quantal; urgency=low | ||
772 | 767 | |||
773 | 768 | * New upstream release (LP: #1044367) | ||
774 | 769 | |||
775 | 770 | [ Julian Edwards ] | ||
776 | 771 | * Fix 02-pserv-config.patch to handle new default tftp directory | ||
777 | 772 | |||
778 | 773 | [ Andres Rodriguez ] | ||
779 | 774 | * debian/maas.postinst: | ||
780 | 775 | - include '/MAAS' for DEFAULT_MAAS_URL.(LP: #1033956) | ||
781 | 776 | - Update bzr version to safely upgrade. | ||
782 | 777 | * Add maas-dns package that configures DNS in MAAS (LP: #1030860) | ||
783 | 778 | * Remove cobbler related bits | ||
784 | 779 | - debian/maas.postinst: Drop cobbler configuration | ||
785 | 780 | - debian/maas.install: Drop installation of snippets/preseeds. | ||
786 | 781 | - debian/control: | ||
787 | 782 | + Drop Depends on maas-provision. (LP: #975473) | ||
788 | 783 | + Depends on bind9utils. | ||
789 | 784 | + Depends on python-lockfile (LP: #1037400) | ||
790 | 785 | Add necessary Conflicts/Replaces. Add conflicts to tftpd-hpa and dnsmasq. | ||
791 | 786 | Depends on isc-dhcp-server for maas-dhcp, and syslinux-common. | ||
792 | 787 | - debian/extras/maas-provision: Add missing "$@" (LP: #1040462) | ||
793 | 788 | - debian/patches: | ||
794 | 789 | + 02-pserv-config.patch: Updated. Do not patch cobbler related bits. | ||
795 | 790 | patch tftp config to default. | ||
796 | 791 | * maas-dhcp: Re-add to handle initial configuration of MAAS DHCP server. | ||
797 | 792 | * Allow restart of 'isc-dhcp-server' by adding a sudoers file: | ||
798 | 793 | - debian/extras/99-maas-sudoers: Added. | ||
799 | 794 | - debian/maas.install: Install 99-maas-sudoers | ||
800 | 795 | * Minor improvements on dbconfig-common handling: | ||
801 | 796 | - debian/maas.config: Only call dbc_go when scripts present. | ||
802 | 797 | - debian/maas.postrm: Only call dbc_go when config file exists. | ||
803 | 798 | * debian/maas.maas-celery.upstart: Enable Beat and set scheduler db file. | ||
804 | 799 | * debian/maas-dns.postinst: Set correct permissions. (LP: #1042868) | ||
805 | 800 | * debian/maas-dhcp.config: | ||
806 | 801 | - Ask whether we want to enable DHCP (LP: #1044229) | ||
807 | 802 | - Add debconf question for network interfaces | ||
808 | 803 | * debian/maas.prerm: Stop services before removing database (LP: #1044559) | ||
809 | 804 | |||
810 | 805 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 02 Aug 2012 09:01:43 -0400 | ||
811 | 806 | |||
812 | 807 | maas (0.1+bzr777+dfsg-0ubuntu1) quantal-proposed; urgency=low | ||
813 | 808 | |||
814 | 809 | * New upstream release | ||
815 | 810 | * Only run 'maas' command as root. (LP: #974046) | ||
816 | 811 | - debian/extras/maas: Check id. | ||
817 | 812 | - debian/maas.install: Install in 'sbin'. | ||
818 | 813 | * debian/maas.postinst: | ||
819 | 814 | - restart apache2 after everything gets processed. | ||
820 | 815 | - Update version to handle upgrades. | ||
821 | 816 | * debian/extras/maas-provision: Add wrapper to access 'maasprovisiong' | ||
822 | 817 | command line. | ||
823 | 818 | * debian/patches/99_temporary_fix_path.patch: Dropped. No longer needed. | ||
824 | 819 | |||
825 | 820 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Jul 2012 08:28:36 -0400 | ||
826 | 821 | |||
827 | 822 | maas (0.1+bzr745+dfsg-0ubuntu2) quantal; urgency=low | ||
828 | 823 | |||
829 | 824 | * debian/control: Build-Dep on python-django instead of | ||
830 | 825 | python-django-configglue | ||
831 | 826 | |||
832 | 827 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Jul 2012 08:24:25 -0400 | ||
833 | 828 | |||
834 | 829 | maas (0.1+bzr745+dfsg-0ubuntu1) quantal; urgency=low | ||
835 | 830 | |||
836 | 831 | * New Upstream Release | ||
837 | 832 | * debian/patches: | ||
838 | 833 | - 99_power_fixes.patch: Dropped. Merged Upstream. | ||
839 | 834 | - 99_enums_js.patch: Dropped. No longer needed. | ||
840 | 835 | * Automatically build enums.js: | ||
841 | 836 | - debian/control: Build-Depends on python-django-configglue | ||
842 | 837 | - debian/rules: Build and install enums.js. | ||
843 | 838 | * debian/maas.postinst: Update version to handle upgrades | ||
844 | 839 | |||
845 | 840 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 12 Jul 2012 16:34:11 -0400 | ||
846 | 841 | |||
847 | 842 | maas (0.1+bzr740+dfsg-0ubuntu1) quantal; urgency=low | ||
848 | 843 | |||
849 | 844 | * New upstream release | ||
850 | 845 | * debian/control: Depends on python-txtftp. | ||
851 | 846 | * debian/rules: Do not ship python-tx-tftp. | ||
852 | 847 | * debian/maas.postinst: Update version to upgrade successfully. | ||
853 | 848 | * debian/patches: | ||
854 | 849 | - 02-pserv-config.patch: Refreshed. | ||
855 | 850 | - 99_enums_js.patch: Updated. | ||
856 | 851 | - 99_power_fixes.patch: Added temporarily to enable IPMI | ||
857 | 852 | - 99_temporary_fix_path.patch: Added temporarily to not fail when | ||
858 | 853 | importing celeryconfig | ||
859 | 854 | |||
860 | 855 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Jul 2012 17:54:49 -0400 | ||
861 | 856 | |||
862 | 857 | maas (0.1+bzr709+dfsg-0ubuntu1) quantal; urgency=low | ||
863 | 858 | |||
864 | 859 | * New Upstream release | ||
865 | 860 | * debian/control: | ||
866 | 861 | - Depends on python-celery, python-tempita, libjs-yui3-{full,min}, | ||
867 | 862 | libjs-raphael | ||
868 | 863 | * debian/maas.install: | ||
869 | 864 | - Install apiclient, celeryconfig.py, maas-import-pxe-files, preseeds_v2. | ||
870 | 865 | - Update to install various files from chroot, rather tha manually copy | ||
871 | 866 | them from the source. | ||
872 | 867 | * debian/maas.links: symlink celeryconfig.py | ||
873 | 868 | * debian/maas.maas-celery.upstart: Add job. | ||
874 | 869 | * debian/rules: | ||
875 | 870 | - Install celery upstart job. | ||
876 | 871 | - Do not install jslibs as packages are now used. | ||
877 | 872 | - Drop copying of maas_local_settings_sample.py as source now ships | ||
878 | 873 | a maas_local_settings.py | ||
879 | 874 | * debian/patches: | ||
880 | 875 | - 04-maas-http-fix.patch: Drop. Merged upstream. | ||
881 | 876 | - 01-fix-database-settings.patch: Refreshed. | ||
882 | 877 | - 99_enums_js.patch: Added until creation of enum.js / build process | ||
883 | 878 | is fixed. | ||
884 | 879 | * debian/maas.postinst: Update bzr version to correctly handle upgrades. | ||
885 | 880 | |||
886 | 881 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Jul 2012 17:42:37 -0400 | ||
887 | 882 | |||
888 | 883 | maas (0.1+bzr482+dfsg-0ubuntu1) precise; urgency=low | ||
889 | 884 | |||
890 | 885 | * New upstream release (Fixes LP: #981103) | ||
891 | 886 | * debian/maas.postinst: | ||
892 | 887 | - Make sure rabbitmq and postgresql are started on upgrade (LP: #981282) | ||
893 | 888 | - Handle upgrades from any lower than 0.1+bzr462+dfsg-0ubuntu1 to | ||
894 | 889 | correctly re-generate passwords, and not have db sync/migrate issues | ||
895 | 890 | as config has changed upstream. | ||
896 | 891 | - Correctly set Passwords for PSERV, otherwise it won't set new passwords. | ||
897 | 892 | * Allow MAAS_DEFAULT_URL reconfiguration. (LP: #980970) | ||
898 | 893 | - debian/maas.config: Add reconfigure validation to correctly allow it, | ||
899 | 894 | and ask a question. | ||
900 | 895 | - debian/maas.postinst: Reconfigure DEFAULT_MAAS_URL as well as cobbler | ||
901 | 896 | server and next_server for PXE/Provisioning. | ||
902 | 897 | - debian/maas.templates: Add debconf question and update info. | ||
903 | 898 | * Do not lose MAAS_DEFAULT_URL settings on upgrade (LP: #984309) | ||
904 | 899 | * debian/maas.postinst: | ||
905 | 900 | - Set cobbler password in between quotes (LP: #984427) | ||
906 | 901 | - Do not change permissions to maas.log (LP: #980915) | ||
907 | 902 | * no longer use maas-cloudimg2ephemeral, but rather use premade images | ||
908 | 903 | at http://maas.ubuntu.com | ||
909 | 904 | |||
910 | 905 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Apr 2012 23:44:46 -0700 | ||
911 | 906 | |||
912 | 907 | maas (0.1+bzr462+dfsg-0ubuntu1) precise; urgency=low | ||
913 | 908 | |||
914 | 909 | * New upstream release (LP: #980240) | ||
915 | 910 | |||
916 | 911 | [ Scott Moser ] | ||
917 | 912 | * add dependency on distro-info (LP: #949442) | ||
918 | 913 | * debian/control: add dependency on tgt for ephemeral iscsi environment | ||
919 | 914 | |||
920 | 915 | [ Andres Rodriguez ] | ||
921 | 916 | * Make package lintian clean: | ||
922 | 917 | - maas{-dhcp}.lintian-overrides: Add to make lintian clean. | ||
923 | 918 | - debian/control: Add missing dependencies; correct section and desc. | ||
924 | 919 | - debian/maas.postinst: Do not use absolute path for rabbitmqctl. | ||
925 | 920 | - debian/patches: Add headers to all patches. | ||
926 | 921 | * debian/maas-dhcp.postrm: Added to disable dnsmasq in cobbler on removal. | ||
927 | 922 | * debian/maas.config: Do not set a password with pwgen as it is not an | ||
928 | 923 | essential package; allow dbconfig-common to create a password instead by | ||
929 | 924 | creating an empty question. (LP: #977475) | ||
930 | 925 | * Run MAAS, pserv, txlongpoll as non-root user. (LP: #975436) | ||
931 | 926 | - debian/maas.postinst: Create user/group; set correct permissions for | ||
932 | 927 | directories. | ||
933 | 928 | - debian/maas.postrm: Remove user/group; restart apache2. | ||
934 | 929 | - debian/maas.maas-{pserv,txlongpoll}.upstart: Update to run as non-root | ||
935 | 930 | 'maas' user. | ||
936 | 931 | * debian/patches/01-fix-database-settings.patch: Remove adding of PSERV_URL. | ||
937 | 932 | * debian/maas.postinst: | ||
938 | 933 | - Handle config file upgrade from versions lower than 0.1+bzr445+dfsg-0ubuntu1, | ||
939 | 934 | by creating new passwords and updating accordingly | ||
940 | 935 | - use local variables in functions. | ||
941 | 936 | - Handle maas tgt configuration for upgrades from 0.1+bzr459+dfsg-0ubuntu1. | ||
942 | 937 | * debian/extras/99-maas: Add squid-deb-proxy file to enable PPAs. (LP: #979383) | ||
943 | 938 | * debian/maas.install: Install missing commissioning-user-data script. | ||
944 | 939 | |||
945 | 940 | [ Dave Walker (Daviey) ] | ||
946 | 941 | * debian/patches/02-pserv-config.patch: Refreshed to apply to updated config. | ||
947 | 942 | |||
948 | 943 | [ Gavin Panella ] | ||
949 | 944 | * debian/maas.postinst: Update pserv.yaml and maas_local_settings.py to use | ||
950 | 945 | password. | ||
951 | 946 | |||
952 | 947 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 12 Apr 2012 16:37:53 -0400 | ||
953 | 948 | |||
954 | 949 | maas (0.1+bzr415+dfsg-0ubuntu2) precise; urgency=low | ||
955 | 950 | |||
956 | 951 | * debian/maas-dhcp.{config,postinst}: | ||
957 | 952 | - Fix not setting new values on fresh install. (LP: #975321) | ||
958 | 953 | - Fix unsetting domain, otherwise, even if disabled, it will always be set. | ||
959 | 954 | * debian/control: Depends on maas for maas-dhcp. | ||
960 | 955 | |||
961 | 956 | -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 06 Apr 2012 15:30:44 -0400 | ||
962 | 957 | |||
963 | 958 | maas (0.1+bzr415+dfsg-0ubuntu1) precise; urgency=low | ||
964 | 959 | |||
965 | 960 | * debian/control: Update package descriptions; Suggests maas-dhcp for maas | ||
966 | 961 | and add a maas-dhcp binary. | ||
967 | 962 | * Add maas-dhcp package to configure a DHCP server. | ||
968 | 963 | - debian/maas-dhcp.config: Add to ask debconf questions about range, | ||
969 | 964 | gateway, and domain. | ||
970 | 965 | - debian/maas-dhcp.postinst: Handle update of config values. | ||
971 | 966 | - debian/maas-dhcp.templates: Debconf questions. | ||
972 | 967 | * debian/po: Update for templates. | ||
973 | 968 | * Add message telling MAAS URL after installation. | ||
974 | 969 | - debian/maas.templates: Add message. | ||
975 | 970 | - debian/maas.postinst: Display message. | ||
976 | 971 | * debian/maas.config: Hide dbconfig-install question. | ||
977 | 972 | |||
978 | 973 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 04 Apr 2012 14:47:13 -0400 | ||
979 | 974 | |||
980 | 975 | maas (0.1+bzr400+dfsg-0ubuntu1) precise; urgency=low | ||
981 | 976 | |||
982 | 977 | * debian/patches/{02-pserv-config,03-txlongpoll-config}.patch: Refreshed. | ||
983 | 978 | * debian/maas.install: Install maas-gc cronjob. | ||
984 | 979 | * Add apport hook. | ||
985 | 980 | - debian/maas.apport: Add hook. | ||
986 | 981 | - debian/rules: Install with apport. | ||
987 | 982 | * debian/maas.logrotate: Add logrotate for txlongpoll and pserv logs. | ||
988 | 983 | * Create 'var/lib/media/maas/storage' on postinst to have right permissions. | ||
989 | 984 | - debian/maas.dirs: Drop dir creation. | ||
990 | 985 | - debian/maas.postinst: Create dir with correct permissions. | ||
991 | 986 | - debian/maas.postrm: Remove dir on purge. | ||
992 | 987 | |||
993 | 988 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Apr 2012 14:50:34 -0400 | ||
994 | 989 | |||
995 | 990 | maas (0.1+bzr378+dfsg-0ubuntu1) precise; urgency=low | ||
996 | 991 | |||
997 | 992 | * maas.dirs: Create var/lib/maas/media/storage for juju storage. | ||
998 | 993 | * maas.postinst: | ||
999 | 994 | - Give correct permissions to above dir. | ||
1000 | 995 | - stop apache2 before db upgrade, and restart after. | ||
1001 | 996 | |||
1002 | 997 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 29 Mar 2012 19:28:13 -0400 | ||
1003 | 998 | |||
1004 | 999 | maas (0.1+bzr363+dfsg-0ubuntu1) precise; urgency=low | ||
1005 | 1000 | |||
1006 | 1001 | [ Dave Walker (Daviey) ] | ||
1007 | 1002 | * debian/control: Add openssh-server as a Recommends, and wrap-and-sort. | ||
1008 | 1003 | |||
1009 | 1004 | [ Andres Rodriguez ] | ||
1010 | 1005 | * debian/maas.postinst: | ||
1011 | 1006 | - Do not start apache with apache2ctl. Use invoke-rc.d instead to not | ||
1012 | 1007 | fail in the installer. | ||
1013 | 1008 | - For start of postgresql before creating the DB, otherwise it will | ||
1014 | 1009 | fail in the installer. | ||
1015 | 1010 | - Add check of invoke-rc.d for syslog. | ||
1016 | 1011 | - Add check of invoke-rc.d for rabbitmq-server; Add check for rabbitmqctl | ||
1017 | 1012 | - Add db_stop, in case invoke-rc.d fails. | ||
1018 | 1013 | * debian/control: Tight python-django-maas dependency. | ||
1019 | 1014 | * debian/postrm: Add check for rabbitmqctl. | ||
1020 | 1015 | * debian/maas.maas-txlongpoll.upstart: Create rabbitmq longpoll user/vhost | ||
1021 | 1016 | and set permissions if they don't exist. Start on rabbitmq-server-running. | ||
1022 | 1017 | |||
1023 | 1018 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 27 Mar 2012 14:49:56 -0400 | ||
1024 | 1019 | |||
1025 | 1020 | maas (0.1+bzr338+dfsg-0ubuntu1) precise; urgency=low | ||
1026 | 1021 | |||
1027 | 1022 | [ Dave Walker (Daviey) ] | ||
1028 | 1023 | * d/patches/03-txlongpoll-config.patch: Resolve typo error from prior patch. | ||
1029 | 1024 | - LP: #961031 | ||
1030 | 1025 | |||
1031 | 1026 | [ Andres Rodriguez ] | ||
1032 | 1027 | * debian/maas.config: Don't allow reconfigure. | ||
1033 | 1028 | * debian/maas.postinst: Don't allow reconfigure. Run sync/migrate db on | ||
1034 | 1029 | all upgrades. | ||
1035 | 1030 | |||
1036 | 1031 | [ Scott Moser ] | ||
1037 | 1032 | * add rsylog config for logging node boots (LP: 960149) | ||
1038 | 1033 | |||
1039 | 1034 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 22 Mar 2012 10:56:58 -0400 | ||
1040 | 1035 | |||
1041 | 1036 | maas (0.1+bzr315+dfsg-0ubuntu1) precise; urgency=low | ||
1042 | 1037 | |||
1043 | 1038 | * New upstream snapshot. | ||
1044 | 1039 | |||
1045 | 1040 | [ Dave Walker ] | ||
1046 | 1041 | * debian/maas.postinst: Do not import ISO's at install time. | ||
1047 | 1042 | * debian/control: | ||
1048 | 1043 | - Drop run-one, it's not a requirement and currently in universe. | ||
1049 | 1044 | - Drop python-setproctitle, no longer required. | ||
1050 | 1045 | |||
1051 | 1046 | [ Andres Rodriguez ] | ||
1052 | 1047 | * debian/control: Depends on python-avahi, python-dbus, and avahi-daemon. | ||
1053 | 1048 | * debian/maas.postinst: | ||
1054 | 1049 | - Only syncdb if dbconfig db creation was selected. | ||
1055 | 1050 | - Set rabbitmq/longpoll settings | ||
1056 | 1051 | * debian/patches/03-txlongpoll-config.patch: Updated broker settings for | ||
1057 | 1052 | rabbitmq. | ||
1058 | 1053 | |||
1059 | 1054 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 20 Mar 2012 20:10:58 -0400 | ||
1060 | 1055 | |||
1061 | 1056 | maas (0.1+bzr300+dfsg-0ubuntu1) precise; urgency=low | ||
1062 | 1057 | |||
1063 | 1058 | * debian/patches: | ||
1064 | 1059 | - 01-fix-database-settings.patch: Update PSERV_URL port. | ||
1065 | 1060 | - 02-pserv-config.patch: Update, and set 'maas' as username. | ||
1066 | 1061 | - 03-longpoll-config.patch: Update. | ||
1067 | 1062 | * debian/maas.install: Install preseeds and snippets. | ||
1068 | 1063 | * debian/maas.postinst: | ||
1069 | 1064 | - Set password for 'maas' cobbler username (in pserv and cobbler). | ||
1070 | 1065 | - Set DEFAULT_MAAS_URL to IP of interface with default gateway. | ||
1071 | 1066 | |||
1072 | 1067 | -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 16 Mar 2012 14:59:16 -0400 | ||
1073 | 1068 | |||
1074 | 1069 | maas (0.1+bzr295+dfsg-0ubuntu2) precise; urgency=low | ||
1075 | 1070 | |||
1076 | 1071 | * debian/patches: | ||
1077 | 1072 | - 01-fix-database-settings.patch: Update to set PSERV_URL. | ||
1078 | 1073 | - 02-pserv-config.patch: Set port to 8001. | ||
1079 | 1074 | * debian/maas.postinst: Run maas-import-isos on install. | ||
1080 | 1075 | * debian/control: Depends on rabbitmq-server. | ||
1081 | 1076 | |||
1082 | 1077 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Mar 2012 18:14:08 -0400 | ||
1083 | 1078 | |||
1084 | 1079 | maas (0.1+bzr295+dfsg-0ubuntu1) precise; urgency=low | ||
1085 | 1080 | |||
1086 | 1081 | * debian/maas.upstart: Specify pidfile and conffile. | ||
1087 | 1082 | * debian/maas.postinst: | ||
1088 | 1083 | - Only run syncdb if dbconfig postinst file exists. | ||
1089 | 1084 | - Fix file permissions. | ||
1090 | 1085 | * debian/maas.{postrm,prerm}: Add dbconfig-common support. | ||
1091 | 1086 | * Add txlongpoll support for packaging: | ||
1092 | 1087 | - debian/control: Depends on python-txlongpoll. | ||
1093 | 1088 | - debian/maas.maas-longpoll.upstart: Added to start txlongpoll. | ||
1094 | 1089 | - debian/maas.install: Install txlongpoll.yaml | ||
1095 | 1090 | * debian/extras/maas: Improvements. | ||
1096 | 1091 | * debian/maas.maas.upstart: Moved from debian/maas.upstart. | ||
1097 | 1092 | * debian/maas.postinst: Touch logfile to set correct permissions (LP: #955400) | ||
1098 | 1093 | * debian/maas.logrotate: Add. | ||
1099 | 1094 | * debian/patches/03-txlongpoll-config.patch: Add default settings. | ||
1100 | 1095 | * debian/maas.config: Only run dbconfig-common on configure/reconfigure. | ||
1101 | 1096 | * Install maas_local_settings.py in /etc/maas and symlink to usr/share/maas | ||
1102 | 1097 | * Update references from MaaS to MAAS. | ||
1103 | 1098 | * Remove podebconf as templates no longer exist. | ||
1104 | 1099 | - debian/po: Remove. | ||
1105 | 1100 | - debian/control: Drop Build-Depends on po-debconf | ||
1106 | 1101 | |||
1107 | 1102 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Mar 2012 15:28:14 -0400 | ||
1108 | 1103 | |||
1109 | 1104 | maas (0.1+bzr266+dfsg-0ubuntu1) precise; urgency=low | ||
1110 | 1105 | |||
1111 | 1106 | * Remove support for squid3 and use squid-deb-proxy instead. | ||
1112 | 1107 | * debian/extras/maas: Add to handle syncdb and creation of admin user. | ||
1113 | 1108 | * Add debconf questions to ask for user/pass: | ||
1114 | 1109 | - debian/maas.{template,config}: Add | ||
1115 | 1110 | - debian/maas.postinst: Ask debconf questions. | ||
1116 | 1111 | - debian/po: Add translation templates.i | ||
1117 | 1112 | * debian/maas.postinst: Enable wsgi module; drop squid3 steps. | ||
1118 | 1113 | * debian/maas.postrm: removed. | ||
1119 | 1114 | * debian/patches/01-fix-database-settings.patch: Custom database settings | ||
1120 | 1115 | and static files path. | ||
1121 | 1116 | * debian/{rules,maas.install}: Install maas static files in | ||
1122 | 1117 | 'usr/share/maas/web/static'. | ||
1123 | 1118 | * Integrate cobbler: | ||
1124 | 1119 | - debian/maas.install: Install pserv twisted plugin, and config. | ||
1125 | 1120 | - debian/maas.upstart: Created to start plugin daemon. | ||
1126 | 1121 | - debian/patches/02-pserv-config.patch: Custom pserv config. | ||
1127 | 1122 | * Integrate dbconfig-common: | ||
1128 | 1123 | - debian/maas.config: Added and default user/pass and database. | ||
1129 | 1124 | - debian/maas.{postinst,postrm}: Added handling for dbconfig-common | ||
1130 | 1125 | * debian/control: Depends on python-convoy. | ||
1131 | 1126 | * debian/rules: Update path to removal of dsfg files. | ||
1132 | 1127 | * debian/patches/01-fix-database-settings.patch: Updated. | ||
1133 | 1128 | |||
1134 | 1129 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 13 Mar 2012 14:31:50 -0400 | ||
1135 | 1130 | |||
1136 | 1131 | maas (0.1+bzr232+dfsg-0ubuntu1) precise; urgency=low | ||
1137 | 1132 | |||
1138 | 1133 | * New upstream snapshot. | ||
1139 | 1134 | |||
1140 | 1135 | [ Dave Walker ] | ||
1141 | 1136 | * debian/control: | ||
1142 | 1137 | - Changed depends from psycopg2 to python-psycopg2 and dropped versioning. | ||
1143 | 1138 | - LP: #937982 | ||
1144 | 1139 | |||
1145 | 1140 | [ Andres Rodriguez ] | ||
1146 | 1141 | * debian/maas.install: Install maas-import-isos and related files. | ||
1147 | 1142 | * Integrate squid3 as proxy solution: | ||
1148 | 1143 | - debian/extras/squid.conf: Added | ||
1149 | 1144 | - debian/control: Depend on squid3. | ||
1150 | 1145 | - debian/maas.{postinst,postrm}: Handle installation/removal of custom | ||
1151 | 1146 | squid config file. | ||
1152 | 1147 | * Split into different binary packages (maas,python-django-maas). | ||
1153 | 1148 | - debian/maas.postinst: Handle the apache2 configuration. | ||
1154 | 1149 | |||
1155 | 1150 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 07 Mar 2012 12:46:17 -0500 | ||
1156 | 1151 | |||
1157 | 1152 | maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low | ||
1158 | 1153 | |||
1159 | 1154 | * New upstream snapshot, post 0.1 release. | ||
1160 | 1155 | * debian/control: | ||
1161 | 1156 | - Drop depends on rabbitmq-server, no longer required. | ||
1162 | 1157 | * debian/watch: Introduced watch file. | ||
1163 | 1158 | |||
1164 | 1159 | -- Dave Walker (Daviey) <DaveWalker@ubuntu.com> Thu, 23 Feb 2012 13:08:12 +0000 | ||
1165 | 1160 | |||
1166 | 1161 | maas (0.1~bzr146+dfsg-0ubuntu1) precise; urgency=low | ||
1167 | 1162 | |||
1168 | 1163 | * Initial release | ||
1169 | 1164 | |||
1170 | 1165 | -- Julian Edwards <julian.edwards@canonical.com> Thu, 16 Jan 2012 15:29:07 +0000 | ||
1171 | 0 | 1166 | ||
1172 | === added file 'debian/compat' | |||
1173 | --- debian/compat 1970-01-01 00:00:00 +0000 | |||
1174 | +++ debian/compat 2014-07-15 21:22:45 +0000 | |||
1175 | @@ -0,0 +1,1 @@ | |||
1176 | 1 | 7 | ||
1177 | 0 | 2 | ||
1178 | === added file 'debian/control' | |||
1179 | --- debian/control 1970-01-01 00:00:00 +0000 | |||
1180 | +++ debian/control 2014-07-15 21:22:45 +0000 | |||
1181 | @@ -0,0 +1,232 @@ | |||
1182 | 1 | Source: maas | ||
1183 | 2 | Section: net | ||
1184 | 3 | Priority: optional | ||
1185 | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | ||
1186 | 5 | Build-Depends: debhelper (>= 8.1.0~), | ||
1187 | 6 | dh-apport, | ||
1188 | 7 | po-debconf, | ||
1189 | 8 | python (>= 2.7), | ||
1190 | 9 | python-distribute, | ||
1191 | 10 | python-django | ||
1192 | 11 | Standards-Version: 3.9.4 | ||
1193 | 12 | X-Python-Version: >= 2.7 | ||
1194 | 13 | Homepage: https://launchpad.net/maas | ||
1195 | 14 | |||
1196 | 15 | Package: maas | ||
1197 | 16 | Architecture: all | ||
1198 | 17 | Depends: ${misc:Depends}, maas-cluster-controller, maas-region-controller, python-django-maas | ||
1199 | 18 | Description: MAAS server all-in-one metapackage | ||
1200 | 19 | MAAS is "Metal As A Service", a system for dynamic provisioning of physical | ||
1201 | 20 | servers that has many of the same characteristics as a cloud. You register | ||
1202 | 21 | servers with MAAS by telling MAAS about their IPMI or other control system. | ||
1203 | 22 | MAAS can then do hardware inventory, and provision that system on demand | ||
1204 | 23 | with whatever OS and software you like. MAAS is standalone software that | ||
1205 | 24 | works with any configuration system, but for best results combine MAAS with | ||
1206 | 25 | Juju. | ||
1207 | 26 | . | ||
1208 | 27 | MAAS provides: | ||
1209 | 28 | * Hardware inventory of servers | ||
1210 | 29 | * Dynamic provisioning based on name or attributes such as disk, RAM cores, sockets | ||
1211 | 30 | * DNS and DHCP as needed | ||
1212 | 31 | * PXE boot services | ||
1213 | 32 | . | ||
1214 | 33 | This package is a metapackage which installs all of the separate components | ||
1215 | 34 | of MAAS on a single machine. | ||
1216 | 35 | |||
1217 | 36 | Package: maas-common | ||
1218 | 37 | Architecture: all | ||
1219 | 38 | Depends: ${misc:Depends}, ${python:Depends} | ||
1220 | 39 | Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) | ||
1221 | 40 | Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) | ||
1222 | 41 | Description: MAAS server common files | ||
1223 | 42 | This package contains the common files for any MAAS installation. | ||
1224 | 43 | |||
1225 | 44 | Package: maas-region-controller-min | ||
1226 | 45 | Architecture: all | ||
1227 | 46 | Depends: apache2, | ||
1228 | 47 | bind9utils, | ||
1229 | 48 | dbconfig-common, | ||
1230 | 49 | iproute, | ||
1231 | 50 | libapache2-mod-wsgi, | ||
1232 | 51 | libjs-raphael, | ||
1233 | 52 | libjs-yui3-full, | ||
1234 | 53 | libjs-yui3-min, | ||
1235 | 54 | maas-common (= ${binary:Version}), | ||
1236 | 55 | pwgen, | ||
1237 | 56 | python-django (>= 1.4), | ||
1238 | 57 | python-django-maas (= ${binary:Version}), | ||
1239 | 58 | python-django-piston, | ||
1240 | 59 | python-django-south, | ||
1241 | 60 | python-maas-provisioningserver (= ${binary:Version}), | ||
1242 | 61 | python-djorm-ext-pgarray, | ||
1243 | 62 | rsyslog, | ||
1244 | 63 | squid-deb-proxy, | ||
1245 | 64 | ${misc:Depends}, | ||
1246 | 65 | ${python:Depends} | ||
1247 | 66 | Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 ) | ||
1248 | 67 | Replaces: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 ) | ||
1249 | 68 | Description: MAAS Server minimum region controller | ||
1250 | 69 | This package installs and configures the minimum region controller | ||
1251 | 70 | services provided by MAAS, including the web UI, caching package proxy, | ||
1252 | 71 | networking/traffic control, and remote logging system. | ||
1253 | 72 | |||
1254 | 73 | Package: maas-region-controller | ||
1255 | 74 | Architecture: all | ||
1256 | 75 | Depends: maas-region-controller-min (= ${binary:Version}), | ||
1257 | 76 | postgresql (>= 9.1), | ||
1258 | 77 | rabbitmq-server, | ||
1259 | 78 | ${misc:Depends}, | ||
1260 | 79 | ${python:Depends} | ||
1261 | 80 | Recommends: openssh-server, maas-dns (= ${binary:Version}) | ||
1262 | 81 | Description: MAAS server complete region controller | ||
1263 | 82 | This package installs and configures the complete MAAS region controller, | ||
1264 | 83 | including the minimum setup, plus the database server and messaging queue. | ||
1265 | 84 | |||
1266 | 85 | Package: python-maas-provisioningserver | ||
1267 | 86 | Section: python | ||
1268 | 87 | Architecture: all | ||
1269 | 88 | Depends: python-amqp, | ||
1270 | 89 | python-celery, | ||
1271 | 90 | python-distro-info, | ||
1272 | 91 | python-formencode, | ||
1273 | 92 | python-jsonschema, | ||
1274 | 93 | python-lockfile, | ||
1275 | 94 | python-lxml, | ||
1276 | 95 | python-maas-client, | ||
1277 | 96 | python-netifaces, | ||
1278 | 97 | python-oops, | ||
1279 | 98 | python-oops-amqp, | ||
1280 | 99 | python-oops-datedir-repo, | ||
1281 | 100 | python-oops-twisted, | ||
1282 | 101 | python-pyparsing, | ||
1283 | 102 | python-seamicroclient, | ||
1284 | 103 | python-simplestreams, | ||
1285 | 104 | python-tempita, | ||
1286 | 105 | python-twisted-core, | ||
1287 | 106 | python-twisted-web, | ||
1288 | 107 | python-txamqp, | ||
1289 | 108 | python-txtftp, | ||
1290 | 109 | python-yaml, | ||
1291 | 110 | python-zope.interface, | ||
1292 | 111 | ${misc:Depends}, | ||
1293 | 112 | ${python:Depends} | ||
1294 | 113 | Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1) | ||
1295 | 114 | Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1) | ||
1296 | 115 | Conflicts: python-librabbitmq | ||
1297 | 116 | Description: MAAS server provisioning libraries | ||
1298 | 117 | This package provides the MAAS provisioning server python libraries. | ||
1299 | 118 | |||
1300 | 119 | Package: maas-cli | ||
1301 | 120 | Architecture: all | ||
1302 | 121 | Depends: python-bzrlib, | ||
1303 | 122 | python-httplib2, | ||
1304 | 123 | python-maas-client (= ${binary:Version}), | ||
1305 | 124 | python-oauth, | ||
1306 | 125 | ${misc:Depends}, | ||
1307 | 126 | ${python:Depends} | ||
1308 | 127 | Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1) | ||
1309 | 128 | Replaces: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1) | ||
1310 | 129 | Description: MAAS command line API tool | ||
1311 | 130 | This package contains the MAAS client command line API tool. | ||
1312 | 131 | This tool enables automation of tasks in MAAS, remotely, through | ||
1313 | 132 | its API. | ||
1314 | 133 | |||
1315 | 134 | Package: python-maas-client | ||
1316 | 135 | Section: python | ||
1317 | 136 | Architecture: all | ||
1318 | 137 | Depends: python-oauth, ${misc:Depends}, ${python:Depends} | ||
1319 | 138 | Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ) | ||
1320 | 139 | Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ) | ||
1321 | 140 | Description: MAAS python API client | ||
1322 | 141 | This package contains the MAAS client API Python modules. | ||
1323 | 142 | |||
1324 | 143 | Package: maas-cluster-controller | ||
1325 | 144 | Architecture: all | ||
1326 | 145 | Depends: apache2, | ||
1327 | 146 | authbind, | ||
1328 | 147 | bind9utils, | ||
1329 | 148 | distro-info, | ||
1330 | 149 | freeipmi-tools, | ||
1331 | 150 | grub-common, | ||
1332 | 151 | maas-cli (=${binary:Version}), | ||
1333 | 152 | maas-common (=${binary:Version}), | ||
1334 | 153 | maas-dhcp (=${binary:Version}), | ||
1335 | 154 | python-amqp, | ||
1336 | 155 | python-celery, | ||
1337 | 156 | python-httplib2, | ||
1338 | 157 | python-lockfile, | ||
1339 | 158 | python-maas-provisioningserver (=${binary:Version}), | ||
1340 | 159 | python-netaddr, | ||
1341 | 160 | python-oauth, | ||
1342 | 161 | python-pexpect, | ||
1343 | 162 | python-tempita, | ||
1344 | 163 | python-twisted, | ||
1345 | 164 | python-zope.interface, | ||
1346 | 165 | rsyslog, | ||
1347 | 166 | syslinux-common, | ||
1348 | 167 | tgt, | ||
1349 | 168 | ubuntu-cloudimage-keyring, | ||
1350 | 169 | uuid-runtime, | ||
1351 | 170 | wget, | ||
1352 | 171 | ${misc:Depends}, | ||
1353 | 172 | ${python:Depends} | ||
1354 | 173 | Suggests: ipmitool, libvirt-bin, amtterm | ||
1355 | 174 | Conflicts: tftpd-hpa, python-librabbitmq | ||
1356 | 175 | Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ) | ||
1357 | 176 | Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ) | ||
1358 | 177 | Description: MAAS server cluster controller | ||
1359 | 178 | This package contains the MAAS cluster controller, which is responsible | ||
1360 | 179 | for enabling and controlling remote DHCP/TFTP instances on their own | ||
1361 | 180 | subnets. | ||
1362 | 181 | |||
1363 | 182 | Package: python-django-maas | ||
1364 | 183 | Section: python | ||
1365 | 184 | Architecture: all | ||
1366 | 185 | Depends: python-amqp, | ||
1367 | 186 | python-celery, | ||
1368 | 187 | python-convoy, | ||
1369 | 188 | python-crochet, | ||
1370 | 189 | python-curtin, | ||
1371 | 190 | python-lockfile, | ||
1372 | 191 | python-lxml, | ||
1373 | 192 | python-maas-client (= ${binary:Version}), | ||
1374 | 193 | python-netaddr, | ||
1375 | 194 | python-oops, | ||
1376 | 195 | python-oops-amqp, | ||
1377 | 196 | python-oops-datedir-repo, | ||
1378 | 197 | python-oops-twisted, | ||
1379 | 198 | python-oops-wsgi, | ||
1380 | 199 | python-psycopg2, | ||
1381 | 200 | python-sphinx, | ||
1382 | 201 | python-tempita, | ||
1383 | 202 | python-twisted, | ||
1384 | 203 | python-txamqp, | ||
1385 | 204 | python-txlongpoll, | ||
1386 | 205 | python-zope.interface, | ||
1387 | 206 | ${misc:Depends}, | ||
1388 | 207 | ${python:Depends} | ||
1389 | 208 | Conflicts: python-librabbitmq | ||
1390 | 209 | Description: MAAS server Django web framework | ||
1391 | 210 | This package provides the Django web framework for MAAS. | ||
1392 | 211 | |||
1393 | 212 | Package: maas-dhcp | ||
1394 | 213 | Architecture: all | ||
1395 | 214 | Depends: isc-dhcp-server (>= 4.2.4), ${misc:Depends} | ||
1396 | 215 | Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) | ||
1397 | 216 | Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) | ||
1398 | 217 | Description: MAAS DHCP server | ||
1399 | 218 | This package installs and configures a DHCP server that can be used by | ||
1400 | 219 | MAAS, and enhances the overall MAAS user experience. | ||
1401 | 220 | |||
1402 | 221 | Package: maas-dns | ||
1403 | 222 | Architecture: all | ||
1404 | 223 | Depends: bind9, | ||
1405 | 224 | maas-region-controller-min (= ${binary:Version}), | ||
1406 | 225 | python-iscpy, | ||
1407 | 226 | ${misc:Depends} | ||
1408 | 227 | Conflicts: dnsmasq | ||
1409 | 228 | Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) | ||
1410 | 229 | Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) | ||
1411 | 230 | Description: MAAS DNS server | ||
1412 | 231 | This package installs and configures a DNS server that can be used by | ||
1413 | 232 | MAAS, and enhances the overall MAAS user experience. | ||
1414 | 0 | 233 | ||
1415 | === added file 'debian/copyright' | |||
1416 | --- debian/copyright 1970-01-01 00:00:00 +0000 | |||
1417 | +++ debian/copyright 2014-07-15 21:22:45 +0000 | |||
1418 | @@ -0,0 +1,25 @@ | |||
1419 | 1 | Format: http://dep.debian.net/deps/dep5 | ||
1420 | 2 | Upstream-Name: maas | ||
1421 | 3 | Source: https://launchpad.net/maas | ||
1422 | 4 | |||
1423 | 5 | Files: * | ||
1424 | 6 | Copyright: 2012 Canonical Ltd. | ||
1425 | 7 | License: AGPL-3.0+ | ||
1426 | 8 | |||
1427 | 9 | Files: debian/* | ||
1428 | 10 | Copyright: 2012 Canonical Ltd. | ||
1429 | 11 | License: AGPL-3.0+ | ||
1430 | 12 | |||
1431 | 13 | License: AGPL-3.0+ | ||
1432 | 14 | This program is free software: you can redistribute it and/or modify | ||
1433 | 15 | it under the terms of the GNU Affero General Public License as | ||
1434 | 16 | published by the Free Software Foundation, either version 3 of the | ||
1435 | 17 | License, or (at your option) any later version. | ||
1436 | 18 | . | ||
1437 | 19 | This program is distributed in the hope that it will be useful, | ||
1438 | 20 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1439 | 21 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1440 | 22 | GNU Affero General Public License for more details. | ||
1441 | 23 | . | ||
1442 | 24 | You should have received a copy of the GNU Affero General Public License | ||
1443 | 25 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1444 | 0 | 26 | ||
1445 | === added directory 'debian/extras' | |||
1446 | === added file 'debian/extras/20-maas.conf' | |||
1447 | --- debian/extras/20-maas.conf 1970-01-01 00:00:00 +0000 | |||
1448 | +++ debian/extras/20-maas.conf 2014-07-15 21:22:45 +0000 | |||
1449 | @@ -0,0 +1,32 @@ | |||
1450 | 1 | # Enable the udp server for installation logging | ||
1451 | 2 | $ModLoad imudp | ||
1452 | 3 | $UDPServerRun 514 | ||
1453 | 4 | $ModLoad imtcp # load TCP listener | ||
1454 | 5 | |||
1455 | 6 | # The following section (certificates) was copied from orchestra, but is | ||
1456 | 7 | # not used here. In the future, if we needed secure ssl, then re-enable. | ||
1457 | 8 | # These files were created in the orchestra-logging-server's postinst | ||
1458 | 9 | # | ||
1459 | 10 | ## make gtls driver the default | ||
1460 | 11 | #$DefaultNetstreamDriver gtls | ||
1461 | 12 | # | ||
1462 | 13 | ## certificate files | ||
1463 | 14 | #$DefaultNetstreamDriverCAFile /var/lib/maas/ssl-cert-orchestra-ca.pem | ||
1464 | 15 | #$DefaultNetstreamDriverCertFile /var/lib/maas/.ssl/ssl-cert-orchestra.pem | ||
1465 | 16 | #$DefaultNetstreamDriverKeyFile /var/lib/maas/.ssl/ssl-cert-orchestra-pk.pem | ||
1466 | 17 | # | ||
1467 | 18 | #$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode | ||
1468 | 19 | #$InputTCPServerStreamDriverAuthMode anon # client is NOT authenticated | ||
1469 | 20 | #$InputTCPServerRun 10514 # start up listener at port 10514 | ||
1470 | 21 | |||
1471 | 22 | # Reduce message repetition | ||
1472 | 23 | $RepeatedMsgReduction on | ||
1473 | 24 | ##$RepeatedMsgContainsOrigionalMsg on | ||
1474 | 25 | |||
1475 | 26 | # Message templating | ||
1476 | 27 | $template MAASboot,"/var/log/maas/rsyslog/%HOSTNAME%/%$YEAR%/%$MONTH%/%$DAY%/messages" | ||
1477 | 28 | |||
1478 | 29 | :fromhost-ip, !isequal, "127.0.0.1" ?MAASboot | ||
1479 | 30 | # Stop messages that came from anywhere else from going into other places | ||
1480 | 31 | # like /var/log/syslog. If you want to see these messages there, then comment below | ||
1481 | 32 | & ~ | ||
1482 | 0 | 33 | ||
1483 | === added file 'debian/extras/99-maas' | |||
1484 | --- debian/extras/99-maas 1970-01-01 00:00:00 +0000 | |||
1485 | +++ debian/extras/99-maas 2014-07-15 21:22:45 +0000 | |||
1486 | @@ -0,0 +1,5 @@ | |||
1487 | 1 | # /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas | ||
1488 | 2 | # | ||
1489 | 3 | # Enable launchpad personal package archives for squid-deb-proxy | ||
1490 | 4 | ppa.launchpad.net | ||
1491 | 5 | keyserver.ubuntu.com | ||
1492 | 0 | 6 | ||
1493 | === added file 'debian/extras/99-maas-sudoers' | |||
1494 | --- debian/extras/99-maas-sudoers 1970-01-01 00:00:00 +0000 | |||
1495 | +++ debian/extras/99-maas-sudoers 2014-07-15 21:22:45 +0000 | |||
1496 | @@ -0,0 +1,4 @@ | |||
1497 | 1 | maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart | ||
1498 | 2 | maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server stop | ||
1499 | 3 | maas ALL= NOPASSWD: /usr/sbin/maas-provision | ||
1500 | 4 | maas ALL= NOPASSWD: SETENV: /usr/sbin/maas-import-pxe-files | ||
1501 | 0 | 5 | ||
1502 | === added file 'debian/extras/isc-dhcp-server.override' | |||
1503 | --- debian/extras/isc-dhcp-server.override 1970-01-01 00:00:00 +0000 | |||
1504 | +++ debian/extras/isc-dhcp-server.override 2014-07-15 21:22:45 +0000 | |||
1505 | @@ -0,0 +1,1 @@ | |||
1506 | 1 | manual | ||
1507 | 0 | 2 | ||
1508 | === added file 'debian/extras/maas' | |||
1509 | --- debian/extras/maas 1970-01-01 00:00:00 +0000 | |||
1510 | +++ debian/extras/maas 2014-07-15 21:22:45 +0000 | |||
1511 | @@ -0,0 +1,6 @@ | |||
1512 | 1 | #!/bin/sh | ||
1513 | 2 | if [ "`expr \"$0\" : \".*maas-cli*\"`" != "0" ];then | ||
1514 | 3 | echo " WARNING: The maas-cli command is deprecated and will be removed" \ | ||
1515 | 4 | "in a future\n version. From now on please use 'maas' instead." >&2 | ||
1516 | 5 | fi | ||
1517 | 6 | exec python -m maascli "$@" | ||
1518 | 0 | 7 | ||
1519 | === added file 'debian/extras/maas-probe-dhcp' | |||
1520 | --- debian/extras/maas-probe-dhcp 1970-01-01 00:00:00 +0000 | |||
1521 | +++ debian/extras/maas-probe-dhcp 2014-07-15 21:22:45 +0000 | |||
1522 | @@ -0,0 +1,7 @@ | |||
1523 | 1 | #!/bin/sh | ||
1524 | 2 | if [ "$(id -u)" != "0" ]; then | ||
1525 | 3 | echo "This utility may only be run as root." 1>&2 | ||
1526 | 4 | exit 1 | ||
1527 | 5 | fi | ||
1528 | 6 | export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}" | ||
1529 | 7 | exec /usr/bin/python -m provisioningserver.dhcp.probe "$@" | ||
1530 | 0 | 8 | ||
1531 | === added file 'debian/extras/maas-provision' | |||
1532 | --- debian/extras/maas-provision 1970-01-01 00:00:00 +0000 | |||
1533 | +++ debian/extras/maas-provision 2014-07-15 21:22:45 +0000 | |||
1534 | @@ -0,0 +1,7 @@ | |||
1535 | 1 | #!/bin/sh | ||
1536 | 2 | if [ "$(id -u)" != "0" ]; then | ||
1537 | 3 | echo "This utility may only be run as root." 1>&2 | ||
1538 | 4 | exit 1 | ||
1539 | 5 | fi | ||
1540 | 6 | export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}" | ||
1541 | 7 | exec /usr/bin/python -m provisioningserver "$@" | ||
1542 | 0 | 8 | ||
1543 | === added file 'debian/extras/maas-region-admin' | |||
1544 | --- debian/extras/maas-region-admin 1970-01-01 00:00:00 +0000 | |||
1545 | +++ debian/extras/maas-region-admin 2014-07-15 21:22:45 +0000 | |||
1546 | @@ -0,0 +1,8 @@ | |||
1547 | 1 | #!/bin/sh | ||
1548 | 2 | if [ "$(id -u)" != "0" ]; then | ||
1549 | 3 | echo "This utility may only be run as root." 1>&2 | ||
1550 | 4 | exit 1 | ||
1551 | 5 | fi | ||
1552 | 6 | export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}" | ||
1553 | 7 | export DJANGO_SETTINGS_MODULE="maas.settings" | ||
1554 | 8 | exec /usr/bin/django-admin "$@" | ||
1555 | 0 | 9 | ||
1556 | === added file 'debian/extras/maas-region-celeryd' | |||
1557 | --- debian/extras/maas-region-celeryd 1970-01-01 00:00:00 +0000 | |||
1558 | +++ debian/extras/maas-region-celeryd 2014-07-15 21:22:45 +0000 | |||
1559 | @@ -0,0 +1,50 @@ | |||
1560 | 1 | #!/usr/bin/python | ||
1561 | 2 | import os | ||
1562 | 3 | from grp import getgrnam | ||
1563 | 4 | from pwd import getpwnam | ||
1564 | 5 | |||
1565 | 6 | def start_celery(args): | ||
1566 | 7 | uid = getpwnam(args.user).pw_uid | ||
1567 | 8 | gid = getgrnam(args.group).gr_gid | ||
1568 | 9 | |||
1569 | 10 | env = dict(os.environ, PYTHONPATH="/usr/share/maas") | ||
1570 | 11 | |||
1571 | 12 | command = [ | ||
1572 | 13 | 'celeryd', | ||
1573 | 14 | '--logfile=%s' % args.logfile, | ||
1574 | 15 | '--schedule=%s' % args.schedule, | ||
1575 | 16 | '--loglevel=INFO', | ||
1576 | 17 | '--beat', | ||
1577 | 18 | '--queues=celery,master', | ||
1578 | 19 | ] | ||
1579 | 20 | |||
1580 | 21 | # Change gid first, just in case changing the uid might deprive | ||
1581 | 22 | # us of the privileges required to setgid. | ||
1582 | 23 | os.setgid(gid) | ||
1583 | 24 | os.setuid(uid) | ||
1584 | 25 | |||
1585 | 26 | os.execvpe(command[0], command, env=env) | ||
1586 | 27 | |||
1587 | 28 | def main(): | ||
1588 | 29 | import argparse | ||
1589 | 30 | parser = argparse.ArgumentParser( | ||
1590 | 31 | description='MAAS celery daemon config options') | ||
1591 | 32 | parser.add_argument( | ||
1592 | 33 | '--user', '-u', metavar='USER', default='maas', | ||
1593 | 34 | help="System user identity that should run the cluster controller.") | ||
1594 | 35 | parser.add_argument( | ||
1595 | 36 | '--group', '-g', metavar='GROUP', default='maas', | ||
1596 | 37 | help="System group that should run the cluster controller.") | ||
1597 | 38 | parser.add_argument( | ||
1598 | 39 | '--logfile', '-l', metavar='LOGFILE', default='/var/log/maas/celery-region.log', | ||
1599 | 40 | help="Location of the logfile.") | ||
1600 | 41 | parser.add_argument( | ||
1601 | 42 | '--schedule', '-s', metavar='SCHEDULE', default='/var/lib/maas/celerybeat-region-schedule', | ||
1602 | 43 | help="Location of the beat schedule file.") | ||
1603 | 44 | |||
1604 | 45 | args = args = parser.parse_args() | ||
1605 | 46 | |||
1606 | 47 | start_celery(args) | ||
1607 | 48 | |||
1608 | 49 | if __name__ == '__main__': | ||
1609 | 50 | main() | ||
1610 | 0 | 51 | ||
1611 | === added file 'debian/extras/maas_remote_syslog_compress' | |||
1612 | --- debian/extras/maas_remote_syslog_compress 1970-01-01 00:00:00 +0000 | |||
1613 | +++ debian/extras/maas_remote_syslog_compress 2014-07-15 21:22:45 +0000 | |||
1614 | @@ -0,0 +1,2 @@ | |||
1615 | 1 | # Compress log files not changed in more than 48 hours: | ||
1616 | 2 | 30 4 * * * root find /var/log/maas/rsyslog -type f -mtime +2 -exec bzip2 '{}' \; | ||
1617 | 0 | 3 | ||
1618 | === added file 'debian/maas-cli.install' | |||
1619 | --- debian/maas-cli.install 1970-01-01 00:00:00 +0000 | |||
1620 | +++ debian/maas-cli.install 2014-07-15 21:22:45 +0000 | |||
1621 | @@ -0,0 +1,2 @@ | |||
1622 | 1 | debian/extras/maas usr/bin | ||
1623 | 2 | debian/tmp/usr/lib/python*/dist-packages/maascli | ||
1624 | 0 | 3 | ||
1625 | === added file 'debian/maas-cli.links' | |||
1626 | --- debian/maas-cli.links 1970-01-01 00:00:00 +0000 | |||
1627 | +++ debian/maas-cli.links 2014-07-15 21:22:45 +0000 | |||
1628 | @@ -0,0 +1,1 @@ | |||
1629 | 1 | usr/bin/maas usr/bin/maas-cli | ||
1630 | 0 | 2 | ||
1631 | === added file 'debian/maas-cli.lintian-overrides' | |||
1632 | --- debian/maas-cli.lintian-overrides 1970-01-01 00:00:00 +0000 | |||
1633 | +++ debian/maas-cli.lintian-overrides 2014-07-15 21:22:45 +0000 | |||
1634 | @@ -0,0 +1,1 @@ | |||
1635 | 1 | maas-cli: binary-without-manpage usr/bin/maas-cli | ||
1636 | 0 | 2 | ||
1637 | === added file 'debian/maas-cluster-controller.config' | |||
1638 | --- debian/maas-cluster-controller.config 1970-01-01 00:00:00 +0000 | |||
1639 | +++ debian/maas-cluster-controller.config 2014-07-15 21:22:45 +0000 | |||
1640 | @@ -0,0 +1,36 @@ | |||
1641 | 1 | #!/bin/sh | ||
1642 | 2 | |||
1643 | 3 | set -e | ||
1644 | 4 | |||
1645 | 5 | . /usr/share/debconf/confmodule | ||
1646 | 6 | db_version 2.0 | ||
1647 | 7 | |||
1648 | 8 | # Only ask for new installations and reconfiguring. | ||
1649 | 9 | # XXX Fix to not ask when installing from the CD. | ||
1650 | 10 | if ([ "$1" = "configure" ] && [ -z "$2" ]); then | ||
1651 | 11 | |||
1652 | 12 | db_get maas-cluster-controller/maas-url || true | ||
1653 | 13 | if [ -z "$RET" ]; then | ||
1654 | 14 | # Attempt to pre-populate if installing on the region controller. | ||
1655 | 15 | if [ -e /etc/maas/maas_local_settings.py ]; then | ||
1656 | 16 | url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py) | ||
1657 | 17 | # If the URL doesn't end in /MAAS then add it. This helps upgrades from | ||
1658 | 18 | # precise for which the URL didn't contain /MAAS, which is now required | ||
1659 | 19 | if ! echo $url | grep -qs "/MAAS$"; then | ||
1660 | 20 | url="${url}/MAAS" | ||
1661 | 21 | fi | ||
1662 | 22 | db_set maas-cluster-controller/maas-url "$url" | ||
1663 | 23 | else | ||
1664 | 24 | # Will only get here if dbconf value not already set, or | ||
1665 | 25 | # /etc/maas/maas_local_settings.py doesn't exist. | ||
1666 | 26 | db_input medium maas-cluster-controller/maas-url || true | ||
1667 | 27 | db_go | ||
1668 | 28 | fi | ||
1669 | 29 | fi | ||
1670 | 30 | fi | ||
1671 | 31 | |||
1672 | 32 | if [ "$1" = "reconfigure" ]; then | ||
1673 | 33 | db_input high maas-cluster-controller/maas-url || true | ||
1674 | 34 | db_go | ||
1675 | 35 | fi | ||
1676 | 36 | #DEBHELPER# | ||
1677 | 0 | 37 | ||
1678 | === added file 'debian/maas-cluster-controller.dirs' | |||
1679 | --- debian/maas-cluster-controller.dirs 1970-01-01 00:00:00 +0000 | |||
1680 | +++ debian/maas-cluster-controller.dirs 2014-07-15 21:22:45 +0000 | |||
1681 | @@ -0,0 +1,2 @@ | |||
1682 | 1 | etc/maas | ||
1683 | 2 | var/lib/maas/boot-resources | ||
1684 | 0 | 3 | ||
1685 | === added file 'debian/maas-cluster-controller.install' | |||
1686 | --- debian/maas-cluster-controller.install 1970-01-01 00:00:00 +0000 | |||
1687 | +++ debian/maas-cluster-controller.install 2014-07-15 21:22:45 +0000 | |||
1688 | @@ -0,0 +1,31 @@ | |||
1689 | 1 | # Install twisted plugins | ||
1690 | 2 | twisted/plugins/maasps.py usr/share/pyshared/twisted/plugins | ||
1691 | 3 | |||
1692 | 4 | # Install PSERV config files | ||
1693 | 5 | debian/tmp/etc/maas/pserv.yaml | ||
1694 | 6 | debian/tmp/etc/maas/bootresources.yaml | ||
1695 | 7 | |||
1696 | 8 | # Install cluster config file | ||
1697 | 9 | debian/tmp/etc/maas/maas_cluster.conf | ||
1698 | 10 | |||
1699 | 11 | # Install celery config file | ||
1700 | 12 | debian/tmp/usr/share/maas/celeryconfig_cluster.py | ||
1701 | 13 | |||
1702 | 14 | # Install local celery cluster config file | ||
1703 | 15 | debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py | ||
1704 | 16 | |||
1705 | 17 | # Install templates | ||
1706 | 18 | debian/tmp/etc/maas/templates/dhcp | ||
1707 | 19 | debian/tmp/etc/maas/templates/power | ||
1708 | 20 | debian/tmp/etc/maas/templates/pxe | ||
1709 | 21 | debian/tmp/etc/maas/templates/uefi | ||
1710 | 22 | |||
1711 | 23 | # Install maas-import-pxe-files and related files | ||
1712 | 24 | debian/tmp/usr/sbin/maas-import-pxe-files | ||
1713 | 25 | man/maas-import-pxe-files.8 usr/share/man/man8 | ||
1714 | 26 | debian/tmp/usr/bin/uec2roottar | ||
1715 | 27 | |||
1716 | 28 | # Install all other stuff | ||
1717 | 29 | debian/extras/99-maas-sudoers etc/sudoers.d | ||
1718 | 30 | debian/extras/isc-dhcp-server.override etc/init | ||
1719 | 31 | debian/tmp/etc/maas/maas-cluster-http.conf | ||
1720 | 0 | 32 | ||
1721 | === added file 'debian/maas-cluster-controller.links' | |||
1722 | --- debian/maas-cluster-controller.links 1970-01-01 00:00:00 +0000 | |||
1723 | +++ debian/maas-cluster-controller.links 2014-07-15 21:22:45 +0000 | |||
1724 | @@ -0,0 +1,1 @@ | |||
1725 | 1 | etc/maas/maas_local_celeryconfig_cluster.py usr/share/maas/maas_local_celeryconfig_cluster.py | ||
1726 | 0 | 2 | ||
1727 | === added file 'debian/maas-cluster-controller.lintian-overrides' | |||
1728 | --- debian/maas-cluster-controller.lintian-overrides 1970-01-01 00:00:00 +0000 | |||
1729 | +++ debian/maas-cluster-controller.lintian-overrides 2014-07-15 21:22:45 +0000 | |||
1730 | @@ -0,0 +1,1 @@ | |||
1731 | 1 | maas-cluster-controller: binary-without-manpage usr/bin/uec2roottar | ||
1732 | 0 | 2 | ||
1733 | === added file 'debian/maas-cluster-controller.logrotate' | |||
1734 | --- debian/maas-cluster-controller.logrotate 1970-01-01 00:00:00 +0000 | |||
1735 | +++ debian/maas-cluster-controller.logrotate 2014-07-15 21:22:45 +0000 | |||
1736 | @@ -0,0 +1,9 @@ | |||
1737 | 1 | /var/log/maas/pserv.log { | ||
1738 | 2 | rotate 5 | ||
1739 | 3 | weekly | ||
1740 | 4 | compress | ||
1741 | 5 | missingok | ||
1742 | 6 | postrotate | ||
1743 | 7 | [ -r /var/run/maas-pserv.pid ] && kill -s USR2 $(cat /var/run/maas-pserv.pid) || true | ||
1744 | 8 | endscript | ||
1745 | 9 | } | ||
1746 | 0 | 10 | ||
1747 | === added file 'debian/maas-cluster-controller.maas-cluster-celery.upstart' | |||
1748 | --- debian/maas-cluster-controller.maas-cluster-celery.upstart 1970-01-01 00:00:00 +0000 | |||
1749 | +++ debian/maas-cluster-controller.maas-cluster-celery.upstart 2014-07-15 21:22:45 +0000 | |||
1750 | @@ -0,0 +1,30 @@ | |||
1751 | 1 | # maas-cluster-controller - provisioning service | ||
1752 | 2 | # | ||
1753 | 3 | # MAAS Cluster Controller Service | ||
1754 | 4 | |||
1755 | 5 | description "MAAS Cluster Controller" | ||
1756 | 6 | author "Julian Edwards <julian.edwards@canonical.com>" | ||
1757 | 7 | |||
1758 | 8 | start on filesystem and net-device-up | ||
1759 | 9 | stop on runlevel [016] | ||
1760 | 10 | |||
1761 | 11 | env CONFIG_FILE=/etc/maas/maas_cluster.conf | ||
1762 | 12 | # Use cluster config. | ||
1763 | 13 | env CELERY_CONFIG_MODULE="celeryconfig_cluster" | ||
1764 | 14 | |||
1765 | 15 | pre-start script | ||
1766 | 16 | if [ ! -f $CONFIG_FILE ]; then | ||
1767 | 17 | echo "$CONFIG_FILE does not exist. Aborting." | ||
1768 | 18 | stop | ||
1769 | 19 | exit 0 | ||
1770 | 20 | fi | ||
1771 | 21 | end script | ||
1772 | 22 | |||
1773 | 23 | script | ||
1774 | 24 | # Prepare settings. | ||
1775 | 25 | . $CONFIG_FILE | ||
1776 | 26 | # Allow the cluster-controller process to read CLUSTER_UUID as set | ||
1777 | 27 | # in that config file. | ||
1778 | 28 | export CLUSTER_UUID | ||
1779 | 29 | exec /usr/bin/authbind --deep /usr/sbin/maas-provision start-cluster-controller $MAAS_URL -u maas -g maas | ||
1780 | 30 | end script | ||
1781 | 0 | 31 | ||
1782 | === added file 'debian/maas-cluster-controller.maas-pserv.upstart' | |||
1783 | --- debian/maas-cluster-controller.maas-pserv.upstart 1970-01-01 00:00:00 +0000 | |||
1784 | +++ debian/maas-cluster-controller.maas-pserv.upstart 2014-07-15 21:22:45 +0000 | |||
1785 | @@ -0,0 +1,32 @@ | |||
1786 | 1 | # maas-pserv - provisioning service | ||
1787 | 2 | # | ||
1788 | 3 | # MAAS Provisioning Service | ||
1789 | 4 | |||
1790 | 5 | description "MAAS" | ||
1791 | 6 | author "Andres Rodriguez <andres.rodriguez@canonical.com>" | ||
1792 | 7 | |||
1793 | 8 | start on filesystem and net-device-up | ||
1794 | 9 | stop on runlevel [016] | ||
1795 | 10 | |||
1796 | 11 | respawn | ||
1797 | 12 | |||
1798 | 13 | env CONFIG_FILE=/etc/maas/maas_cluster.conf | ||
1799 | 14 | |||
1800 | 15 | pre-start script | ||
1801 | 16 | if [ ! -f $CONFIG_FILE ]; then | ||
1802 | 17 | echo "$CONFIG_FILE does not exist. Aborting." | ||
1803 | 18 | stop | ||
1804 | 19 | exit 0 | ||
1805 | 20 | fi | ||
1806 | 21 | end script | ||
1807 | 22 | |||
1808 | 23 | script | ||
1809 | 24 | # Prepare settings. | ||
1810 | 25 | . $CONFIG_FILE | ||
1811 | 26 | # Allow the tftpd process to read CLUSTER_UUID as set in that config | ||
1812 | 27 | # file. | ||
1813 | 28 | export CLUSTER_UUID | ||
1814 | 29 | export MAAS_URL | ||
1815 | 30 | # To add options to your daemon, edit the line below: | ||
1816 | 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 | ||
1817 | 32 | end script | ||
1818 | 0 | 33 | ||
1819 | === added file 'debian/maas-cluster-controller.postinst' | |||
1820 | --- debian/maas-cluster-controller.postinst 1970-01-01 00:00:00 +0000 | |||
1821 | +++ debian/maas-cluster-controller.postinst 2014-07-15 21:22:45 +0000 | |||
1822 | @@ -0,0 +1,166 @@ | |||
1823 | 1 | #!/bin/sh | ||
1824 | 2 | |||
1825 | 3 | set -e | ||
1826 | 4 | |||
1827 | 5 | . /usr/share/debconf/confmodule | ||
1828 | 6 | db_version 2.0 | ||
1829 | 7 | |||
1830 | 8 | RELEASE=`lsb_release -rs` || RELEASE="" | ||
1831 | 9 | |||
1832 | 10 | create_log_dir() { | ||
1833 | 11 | # create log dir | ||
1834 | 12 | if [ ! -d /var/lib/maas ]; then | ||
1835 | 13 | mkdir -p /var/lib/maas | ||
1836 | 14 | fi | ||
1837 | 15 | if [ ! -d /var/log/maas/oops ]; then | ||
1838 | 16 | mkdir -p /var/log/maas/oops | ||
1839 | 17 | fi | ||
1840 | 18 | # Give appropriate permissions | ||
1841 | 19 | chown -R maas:maas /var/lib/maas/ | ||
1842 | 20 | chown -R maas:maas /var/log/maas | ||
1843 | 21 | chmod -R 775 /var/log/maas/oops | ||
1844 | 22 | } | ||
1845 | 23 | |||
1846 | 24 | configure_maas_tgt() { | ||
1847 | 25 | # Ensure that iSCSI targets get re-defined on reboot. | ||
1848 | 26 | # Creates a softlink in /etc/tgt/conf.d/ that points to the current | ||
1849 | 27 | # boot images' tgt configuration. | ||
1850 | 28 | mkdir -p /etc/tgt/conf.d | ||
1851 | 29 | ln -sf /var/lib/maas/boot-resources/current/maas.tgt /etc/tgt/conf.d/maas.conf | ||
1852 | 30 | } | ||
1853 | 31 | |||
1854 | 32 | extract_cluster_uuid(){ | ||
1855 | 33 | # Extract ClUSTER_UUID setting from config file $1. This will work | ||
1856 | 34 | # both the cluster celery config (which is python) and the cluster | ||
1857 | 35 | # config (which is shell). | ||
1858 | 36 | sed -n -e "s/^CLUSTER_UUID *= *[\"']\([^\"']*\).*/\1/p" "$1" | ||
1859 | 37 | } | ||
1860 | 38 | |||
1861 | 39 | configure_cluster_uuid(){ | ||
1862 | 40 | # The cluster uuid goes into maas_cluster.conf, but we also still | ||
1863 | 41 | # keep a copy in maas_local_celeryconfig_cluster.py (hopefully just | ||
1864 | 42 | # temporarily). If an old uuid is configured, we replicate that to | ||
1865 | 43 | # maas_cluster.conf; otherwise, we want to generate one. | ||
1866 | 44 | local uuid | ||
1867 | 45 | |||
1868 | 46 | |||
1869 | 47 | if [ -n "$(extract_cluster_uuid /etc/maas/maas_cluster.conf)" ]; then | ||
1870 | 48 | # UUID is already set up. Wonderful. | ||
1871 | 49 | return | ||
1872 | 50 | fi | ||
1873 | 51 | |||
1874 | 52 | # Look for a UUID stored in the old location. | ||
1875 | 53 | uuid="$(extract_cluster_uuid /etc/maas/maas_local_celeryconfig_cluster.py)" | ||
1876 | 54 | |||
1877 | 55 | if [ -z "$uuid" ]; then | ||
1878 | 56 | # No UUID at all yet. Generate one, and insert it into its | ||
1879 | 57 | # placeholder in the old config location. | ||
1880 | 58 | uuid="$(uuidgen)" | ||
1881 | 59 | sed -i "s|^CLUSTER_UUID = None$|CLUSTER_UUID = '$uuid'|" \ | ||
1882 | 60 | /etc/maas/maas_local_celeryconfig_cluster.py | ||
1883 | 61 | fi | ||
1884 | 62 | |||
1885 | 63 | # Either way, at this point we have a uuid, and it is configured in | ||
1886 | 64 | # the old config location. | ||
1887 | 65 | # | ||
1888 | 66 | # Write it to maas_cluster.conf as well. There is no initial | ||
1889 | 67 | # placeholder in this file, so just append the setting. | ||
1890 | 68 | echo "CLUSTER_UUID=\"$uuid\"" >>/etc/maas/maas_cluster.conf | ||
1891 | 69 | } | ||
1892 | 70 | |||
1893 | 71 | enable_apache_version_mod(){ | ||
1894 | 72 | COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true) | ||
1895 | 73 | if [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then | ||
1896 | 74 | a2enmod version | ||
1897 | 75 | fi | ||
1898 | 76 | } | ||
1899 | 77 | |||
1900 | 78 | configure_cluster_http(){ | ||
1901 | 79 | case $RELEASE in | ||
1902 | 80 | 12.04|12.10|13.04) | ||
1903 | 81 | if [ -e /etc/maas/maas-cluster-http.conf -a \ | ||
1904 | 82 | ! -e /etc/apache2/conf.d/maas-cluster-http.conf ]; then | ||
1905 | 83 | ln -sf /etc/maas/maas-cluster-http.conf /etc/apache2/conf.d/maas-cluster-http.conf | ||
1906 | 84 | fi | ||
1907 | 85 | ;; | ||
1908 | 86 | *) | ||
1909 | 87 | # handle apache configs | ||
1910 | 88 | if [ -e /etc/maas/maas-cluster-http.conf -a \ | ||
1911 | 89 | ! -e /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then | ||
1912 | 90 | ln -sf /etc/maas/maas-cluster-http.conf /etc/apache2/conf-enabled/maas-cluster-http.conf | ||
1913 | 91 | fi | ||
1914 | 92 | ;; | ||
1915 | 93 | esac | ||
1916 | 94 | } | ||
1917 | 95 | |||
1918 | 96 | configure_cluster_authbind() { | ||
1919 | 97 | MAAS_UID="`id -u maas`" | ||
1920 | 98 | if [ ! -f "/etc/authbind/byuid/$MAAS_UID" ]; then | ||
1921 | 99 | if [ ! -d "/etc/authbind/byuid" ]; then | ||
1922 | 100 | mkdir -p /etc/authbind/byuid | ||
1923 | 101 | chmod 755 /etc/authbind | ||
1924 | 102 | chmod 755 /etc/authbind/byuid | ||
1925 | 103 | fi | ||
1926 | 104 | fi | ||
1927 | 105 | echo '0.0.0.0/0:68,69' >/etc/authbind/byuid/$MAAS_UID | ||
1928 | 106 | echo '::/0,68-69' >>/etc/authbind/byuid/$MAAS_UID | ||
1929 | 107 | chown maas:maas /etc/authbind/byuid/$MAAS_UID | ||
1930 | 108 | chmod 700 /etc/authbind/byuid/$MAAS_UID | ||
1931 | 109 | } | ||
1932 | 110 | |||
1933 | 111 | restart_apache2(){ | ||
1934 | 112 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
1935 | 113 | invoke-rc.d apache2 restart || true | ||
1936 | 114 | else | ||
1937 | 115 | /etc/init.d/apache2 restart || true | ||
1938 | 116 | fi | ||
1939 | 117 | } | ||
1940 | 118 | |||
1941 | 119 | configure_pserv_generator(){ | ||
1942 | 120 | # Get the MAAS_URL on configure/reconfigure and write it to the conf files. | ||
1943 | 121 | db_get maas-cluster-controller/maas-url || true | ||
1944 | 122 | if [ -n "$RET" ]; then | ||
1945 | 123 | sed -i "s|MAAS_URL=.*|MAAS_URL=\"$RET\"|" /etc/maas/maas_cluster.conf | ||
1946 | 124 | # Extract the hostname part. | ||
1947 | 125 | HOSTPART=$(echo $RET|awk '{ split($0,array,"/")} END{print array[3] }') | ||
1948 | 126 | # And substitute it in-place in pserv.yaml on an indented, non-commented | ||
1949 | 127 | # line. | ||
1950 | 128 | sed -ri "s|^([[:space:]]+)(#+[[:space:]]*)?(generator:[[:space:]]+https?://)[^:/]+|\1\3$HOSTPART|" /etc/maas/pserv.yaml | ||
1951 | 129 | fi | ||
1952 | 130 | } | ||
1953 | 131 | |||
1954 | 132 | |||
1955 | 133 | |||
1956 | 134 | if [ "$1" = "configure" ] && [ -z "$2" ]; then | ||
1957 | 135 | create_log_dir | ||
1958 | 136 | configure_maas_tgt | ||
1959 | 137 | fi | ||
1960 | 138 | |||
1961 | 139 | if [ "$1" = "configure" ]; then | ||
1962 | 140 | if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then | ||
1963 | 141 | create_log_dir | ||
1964 | 142 | fi | ||
1965 | 143 | |||
1966 | 144 | configure_maas_tgt | ||
1967 | 145 | configure_pserv_generator | ||
1968 | 146 | |||
1969 | 147 | # These config files may contain a private cluster UUID. Only maas | ||
1970 | 148 | # can read them; only root can write them | ||
1971 | 149 | chown root:maas \ | ||
1972 | 150 | /etc/maas/maas_local_celeryconfig_cluster.py \ | ||
1973 | 151 | /etc/maas/maas_cluster.conf | ||
1974 | 152 | chmod 0640 \ | ||
1975 | 153 | /etc/maas/maas_local_celeryconfig_cluster.py \ | ||
1976 | 154 | /etc/maas/maas_cluster.conf | ||
1977 | 155 | |||
1978 | 156 | configure_cluster_uuid | ||
1979 | 157 | configure_cluster_authbind | ||
1980 | 158 | enable_apache_version_mod | ||
1981 | 159 | configure_cluster_http | ||
1982 | 160 | restart_apache2 | ||
1983 | 161 | maas-provision upgrade-cluster | ||
1984 | 162 | fi | ||
1985 | 163 | |||
1986 | 164 | db_stop | ||
1987 | 165 | |||
1988 | 166 | #DEBHELPER# | ||
1989 | 0 | 167 | ||
1990 | === added file 'debian/maas-cluster-controller.postrm' | |||
1991 | --- debian/maas-cluster-controller.postrm 1970-01-01 00:00:00 +0000 | |||
1992 | +++ debian/maas-cluster-controller.postrm 2014-07-15 21:22:45 +0000 | |||
1993 | @@ -0,0 +1,43 @@ | |||
1994 | 1 | #!/bin/sh | ||
1995 | 2 | |||
1996 | 3 | set -e | ||
1997 | 4 | |||
1998 | 5 | #DEBHELPER# | ||
1999 | 6 | |||
2000 | 7 | RELEASE=`lsb_release -rs` || RELEASE="" | ||
2001 | 8 | |||
2002 | 9 | case "$1" in | ||
2003 | 10 | purge) | ||
2004 | 11 | # remove log directory | ||
2005 | 12 | rm -rf /var/log/maas | ||
2006 | 13 | case $RELEASE in | ||
2007 | 14 | 12.04|12.10|13.04) | ||
2008 | 15 | if [ -h /etc/apache2/conf.d/maas-cluster-http.conf ]; then | ||
2009 | 16 | rm -rf /etc/apache2/conf.d/maas-cluster-http.conf | ||
2010 | 17 | fi | ||
2011 | 18 | ;; | ||
2012 | 19 | *) | ||
2013 | 20 | # remove apache2 config | ||
2014 | 21 | if [ -h /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then | ||
2015 | 22 | rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf | ||
2016 | 23 | fi | ||
2017 | 24 | ;; | ||
2018 | 25 | esac | ||
2019 | 26 | # remove var directory | ||
2020 | 27 | rm -rf /var/lib/maas/celerybeat-cluster-schedule | ||
2021 | 28 | DIR=/var/lib/maas | ||
2022 | 29 | if [ "$(ls -A $DIR 2> /dev/null)" = "" ]; then | ||
2023 | 30 | rm -rf /var/lib/maas | ||
2024 | 31 | fi | ||
2025 | 32 | |||
2026 | 33 | # Delete symlink for iSCSI config. | ||
2027 | 34 | if [ -L /etc/tgt/conf.d/maas.conf ]; then | ||
2028 | 35 | rm -rf /etc/tgt/conf.d/maas.conf | ||
2029 | 36 | fi | ||
2030 | 37 | |||
2031 | 38 | # Remove authbind | ||
2032 | 39 | MAAS_UID="`id -u maas`" | ||
2033 | 40 | if [ -f "/etc/authbind/byuid/$MAAS_UID" ]; then | ||
2034 | 41 | rm -rf /etc/authbind/byuid/$MAAS_UID | ||
2035 | 42 | fi | ||
2036 | 43 | esac | ||
2037 | 0 | 44 | ||
2038 | === added file 'debian/maas-cluster-controller.templates' | |||
2039 | --- debian/maas-cluster-controller.templates 1970-01-01 00:00:00 +0000 | |||
2040 | +++ debian/maas-cluster-controller.templates 2014-07-15 21:22:45 +0000 | |||
2041 | @@ -0,0 +1,7 @@ | |||
2042 | 1 | Template: maas-cluster-controller/maas-url | ||
2043 | 2 | Type: string | ||
2044 | 3 | Default: | ||
2045 | 4 | _Description: Ubuntu MAAS API address: | ||
2046 | 5 | The MAAS Cluster Controller needs to contact the MAAS server to | ||
2047 | 6 | register its presence. Set the URL to the MAAS API here, e.g. | ||
2048 | 7 | http://192.168.1.1/MAAS | ||
2049 | 0 | 8 | ||
2050 | === added file 'debian/maas-common.install' | |||
2051 | --- debian/maas-common.install 1970-01-01 00:00:00 +0000 | |||
2052 | +++ debian/maas-common.install 2014-07-15 21:22:45 +0000 | |||
2053 | @@ -0,0 +1,2 @@ | |||
2054 | 1 | # Install Celery Config | ||
2055 | 2 | debian/tmp/usr/share/maas/celeryconfig_common.py | ||
2056 | 0 | 3 | ||
2057 | === added file 'debian/maas-common.postinst' | |||
2058 | --- debian/maas-common.postinst 1970-01-01 00:00:00 +0000 | |||
2059 | +++ debian/maas-common.postinst 2014-07-15 21:22:45 +0000 | |||
2060 | @@ -0,0 +1,14 @@ | |||
2061 | 1 | #!/bin/sh | ||
2062 | 2 | |||
2063 | 3 | set -e | ||
2064 | 4 | |||
2065 | 5 | add_user_group(){ | ||
2066 | 6 | local user="maas" | ||
2067 | 7 | local group="maas" | ||
2068 | 8 | addgroup --quiet --system "$group" || true | ||
2069 | 9 | adduser --quiet --system --group --no-create-home "$user" || true | ||
2070 | 10 | } | ||
2071 | 11 | |||
2072 | 12 | add_user_group | ||
2073 | 13 | |||
2074 | 14 | #DEBHELPER# | ||
2075 | 0 | 15 | ||
2076 | === added file 'debian/maas-common.postrm' | |||
2077 | --- debian/maas-common.postrm 1970-01-01 00:00:00 +0000 | |||
2078 | +++ debian/maas-common.postrm 2014-07-15 21:22:45 +0000 | |||
2079 | @@ -0,0 +1,14 @@ | |||
2080 | 1 | #!/bin/sh | ||
2081 | 2 | |||
2082 | 3 | set -e | ||
2083 | 4 | |||
2084 | 5 | case "$1" in | ||
2085 | 6 | purge) | ||
2086 | 7 | # Deleting user/group | ||
2087 | 8 | if getent passwd maas >/dev/null; then | ||
2088 | 9 | deluser maas || true | ||
2089 | 10 | delgroup maas || true | ||
2090 | 11 | fi | ||
2091 | 12 | esac | ||
2092 | 13 | |||
2093 | 14 | #DEBHELPER# | ||
2094 | 0 | 15 | ||
2095 | === added file 'debian/maas-dhcp.apparmor' | |||
2096 | --- debian/maas-dhcp.apparmor 1970-01-01 00:00:00 +0000 | |||
2097 | +++ debian/maas-dhcp.apparmor 2014-07-15 21:22:45 +0000 | |||
2098 | @@ -0,0 +1,7 @@ | |||
2099 | 1 | /run/maas/dhcp/ r, | ||
2100 | 2 | /run/maas/dhcp/** r, | ||
2101 | 3 | /run/maas/dhcp/*.pid lrw, | ||
2102 | 4 | /run/maas/dhcp/*.trace lrw, | ||
2103 | 5 | /run/maas/dhcp/*.leases* lrw, | ||
2104 | 6 | /var/lib/maas/dhcp/dhcpd*.leases* lrw, | ||
2105 | 7 | /etc/maas/dhcpd.conf r, | ||
2106 | 0 | 8 | ||
2107 | === added file 'debian/maas-dhcp.install' | |||
2108 | --- debian/maas-dhcp.install 1970-01-01 00:00:00 +0000 | |||
2109 | +++ debian/maas-dhcp.install 2014-07-15 21:22:45 +0000 | |||
2110 | @@ -0,0 +1,1 @@ | |||
2111 | 1 | /debian/tmp/etc/apparmor.d/dhcpd.d/maas | ||
2112 | 0 | 2 | ||
2113 | === added file 'debian/maas-dhcp.maas-dhcp-server.upstart' | |||
2114 | --- debian/maas-dhcp.maas-dhcp-server.upstart 1970-01-01 00:00:00 +0000 | |||
2115 | +++ debian/maas-dhcp.maas-dhcp-server.upstart 2014-07-15 21:22:45 +0000 | |||
2116 | @@ -0,0 +1,65 @@ | |||
2117 | 1 | description "MAAS instance of ISC DHCP server" | ||
2118 | 2 | author "Jeroen Vermeulen <jtv@canonical.com>" | ||
2119 | 3 | |||
2120 | 4 | start on runlevel [2345] | ||
2121 | 5 | stop on runlevel [!2345] | ||
2122 | 6 | |||
2123 | 7 | env CONFIG_FILE=/etc/maas/dhcpd.conf | ||
2124 | 8 | env PID_DIR=/run/maas/dhcp | ||
2125 | 9 | env PID_FILE=/run/maas/dhcp/dhcpd.pid | ||
2126 | 10 | env LEASES_DIR=/var/lib/maas/dhcp | ||
2127 | 11 | env LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases | ||
2128 | 12 | |||
2129 | 13 | # This is where we write what interfaces dhcpd should listen on. | ||
2130 | 14 | env INTERFACES_FILE=/var/lib/maas/dhcpd-interfaces | ||
2131 | 15 | |||
2132 | 16 | pre-start script | ||
2133 | 17 | if [ ! -f $CONFIG_FILE ]; then | ||
2134 | 18 | echo "$CONFIG_FILE does not exist. Aborting." | ||
2135 | 19 | stop | ||
2136 | 20 | exit 0 | ||
2137 | 21 | fi | ||
2138 | 22 | |||
2139 | 23 | if [ ! -f $INTERFACES_FILE ]; then | ||
2140 | 24 | echo "$INTERFACES_FILE does not exist. Aborting." | ||
2141 | 25 | stop | ||
2142 | 26 | exit 0 | ||
2143 | 27 | fi | ||
2144 | 28 | |||
2145 | 29 | if ! /usr/sbin/dhcpd -t -q -4 -cf $CONFIG_FILE > /dev/null 2>&1; then | ||
2146 | 30 | echo "dhcpd self-test failed. Please fix the config file." | ||
2147 | 31 | echo "The error was: " | ||
2148 | 32 | /usr/sbin/dhcpd -t -4 -cf $CONFIG_FILE | ||
2149 | 33 | stop | ||
2150 | 34 | exit 0 | ||
2151 | 35 | fi | ||
2152 | 36 | end script | ||
2153 | 37 | |||
2154 | 38 | respawn | ||
2155 | 39 | script | ||
2156 | 40 | INTERFACES=`cat "${INTERFACES_FILE}"` | ||
2157 | 41 | |||
2158 | 42 | # Allow dhcp server to write lease and pid file. | ||
2159 | 43 | mkdir -p $PID_DIR | ||
2160 | 44 | chown dhcpd:dhcpd $PID_DIR | ||
2161 | 45 | |||
2162 | 46 | # As of Quantal, the leases file must be owned by root:root (even though | ||
2163 | 47 | # the daemon will run under an unprivileged user). | ||
2164 | 48 | # In Precise, ownership was supposed to be dhcpd:dhcpd. | ||
2165 | 49 | # | ||
2166 | 50 | # maas packages on saucy are only supported with newer isc-dhcp via | ||
2167 | 51 | # the cloud-archive. See bug 1231693 for more information, including | ||
2168 | 52 | # a patch that would actually work to support all, but is complex. | ||
2169 | 53 | |||
2170 | 54 | mkdir -p $LEASES_DIR | ||
2171 | 55 | chown root:root $LEASES_DIR | ||
2172 | 56 | [ -e $LEASES_FILE ] || touch $LEASES_FILE | ||
2173 | 57 | for LFILE in $LEASES_FILE $LEASES_FILE~; do | ||
2174 | 58 | if [ -e $LFILE ]; then | ||
2175 | 59 | chown root:root $LFILE | ||
2176 | 60 | chmod a+r $LFILE | ||
2177 | 61 | fi | ||
2178 | 62 | done | ||
2179 | 63 | |||
2180 | 64 | exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES | ||
2181 | 65 | end script | ||
2182 | 0 | 66 | ||
2183 | === added file 'debian/maas-dhcp.postinst' | |||
2184 | --- debian/maas-dhcp.postinst 1970-01-01 00:00:00 +0000 | |||
2185 | +++ debian/maas-dhcp.postinst 2014-07-15 21:22:45 +0000 | |||
2186 | @@ -0,0 +1,15 @@ | |||
2187 | 1 | #!/bin/sh | ||
2188 | 2 | |||
2189 | 3 | set -e | ||
2190 | 4 | |||
2191 | 5 | if [ "$1" = "configure" ]; then | ||
2192 | 6 | invoke-rc.d isc-dhcp-server stop | ||
2193 | 7 | |||
2194 | 8 | dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd" | ||
2195 | 9 | if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1 | ||
2196 | 10 | then | ||
2197 | 11 | apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" || true | ||
2198 | 12 | fi | ||
2199 | 13 | fi | ||
2200 | 14 | |||
2201 | 15 | #DEBHELPER# | ||
2202 | 0 | 16 | ||
2203 | === added file 'debian/maas-dhcp.postrm' | |||
2204 | --- debian/maas-dhcp.postrm 1970-01-01 00:00:00 +0000 | |||
2205 | +++ debian/maas-dhcp.postrm 2014-07-15 21:22:45 +0000 | |||
2206 | @@ -0,0 +1,13 @@ | |||
2207 | 1 | #!/bin/sh | ||
2208 | 2 | |||
2209 | 3 | set -e | ||
2210 | 4 | |||
2211 | 5 | if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then | ||
2212 | 6 | dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd" | ||
2213 | 7 | if [ -f "${dhcpd_prof}" ] && | ||
2214 | 8 | command -v apparmor_parser >/dev/null 2>&1; then | ||
2215 | 9 | apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" | ||
2216 | 10 | fi | ||
2217 | 11 | fi | ||
2218 | 12 | |||
2219 | 13 | #DEBHELPER# | ||
2220 | 0 | 14 | ||
2221 | === added file 'debian/maas-dns.dirs' | |||
2222 | --- debian/maas-dns.dirs 1970-01-01 00:00:00 +0000 | |||
2223 | +++ debian/maas-dns.dirs 2014-07-15 21:22:45 +0000 | |||
2224 | @@ -0,0 +1,1 @@ | |||
2225 | 1 | etc/bind/maas | ||
2226 | 0 | 2 | ||
2227 | === added file 'debian/maas-dns.postinst' | |||
2228 | --- debian/maas-dns.postinst 1970-01-01 00:00:00 +0000 | |||
2229 | +++ debian/maas-dns.postinst 2014-07-15 21:22:45 +0000 | |||
2230 | @@ -0,0 +1,46 @@ | |||
2231 | 1 | #!/bin/sh | ||
2232 | 2 | |||
2233 | 3 | set -e | ||
2234 | 4 | |||
2235 | 5 | if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then | ||
2236 | 6 | # If /etc/bind/maas is empty, set_up_dns. | ||
2237 | 7 | if [ ! "$(ls -A /etc/bind/maas)" ]; then | ||
2238 | 8 | maas-region-admin set_up_dns | ||
2239 | 9 | fi | ||
2240 | 10 | |||
2241 | 11 | # Fix permissions. | ||
2242 | 12 | if [ -d /etc/bind/maas ]; then | ||
2243 | 13 | chown -R maas:root /etc/bind/maas | ||
2244 | 14 | fi | ||
2245 | 15 | if [ -f /etc/bind/maas/named.conf.maas ]; then | ||
2246 | 16 | chmod 644 /etc/bind/maas/named.conf.maas | ||
2247 | 17 | fi | ||
2248 | 18 | if [ -f /etc/bind/maas/rndc.conf.maas ]; then | ||
2249 | 19 | chmod 600 /etc/bind/maas/rndc.conf.maas | ||
2250 | 20 | fi | ||
2251 | 21 | if [ -f /etc/bind/maas/named.conf.rndc.maas ]; then | ||
2252 | 22 | chown maas:bind /etc/bind/maas/named.conf.rndc.maas | ||
2253 | 23 | chmod 640 /etc/bind/maas/named.conf.rndc.maas | ||
2254 | 24 | fi | ||
2255 | 25 | |||
2256 | 26 | # Remove any existing MAAS-related include line from | ||
2257 | 27 | # /etc/bind/named.conf.local, then re-add it. | ||
2258 | 28 | sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local | ||
2259 | 29 | maas-region-admin get_named_conf --edit --config_path /etc/bind/named.conf.local | ||
2260 | 30 | # Add a line in /etc/bind/named.conf.options that includes the | ||
2261 | 31 | # /etc/named/maas/named.conf.options.inside.maas file. | ||
2262 | 32 | maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options | ||
2263 | 33 | |||
2264 | 34 | invoke-rc.d bind9 restart || true | ||
2265 | 35 | fi | ||
2266 | 36 | |||
2267 | 37 | if [ "$1" = "configure" ]; then | ||
2268 | 38 | # If the /etc/bind/named.conf.options is not set up yet, do it now. | ||
2269 | 39 | # This might happen because of an upgrade from an older package. | ||
2270 | 40 | if ! grep -qs "named.conf.options.inside.maas" /etc/bind/named.conf.options; then | ||
2271 | 41 | maas-region-admin edit_named_options --config-path /etc/bind/named.conf.options | ||
2272 | 42 | invoke-rc.d bind9 restart || true | ||
2273 | 43 | fi | ||
2274 | 44 | fi | ||
2275 | 45 | |||
2276 | 46 | #DEBHELPER# | ||
2277 | 0 | 47 | ||
2278 | === added file 'debian/maas-dns.postrm' | |||
2279 | --- debian/maas-dns.postrm 1970-01-01 00:00:00 +0000 | |||
2280 | +++ debian/maas-dns.postrm 2014-07-15 21:22:45 +0000 | |||
2281 | @@ -0,0 +1,23 @@ | |||
2282 | 1 | #!/bin/sh | ||
2283 | 2 | |||
2284 | 3 | set -e | ||
2285 | 4 | |||
2286 | 5 | if [ "$1" = "remove" ]; then | ||
2287 | 6 | if [ -f /etc/bind/named.conf.local ]; then | ||
2288 | 7 | sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.maas\"\;$/d' \ | ||
2289 | 8 | /etc/bind/named.conf.local | ||
2290 | 9 | fi | ||
2291 | 10 | fi | ||
2292 | 11 | |||
2293 | 12 | if [ "$1" = "purge" ]; then | ||
2294 | 13 | # Remove zone files | ||
2295 | 14 | if [ -d /etc/bind/maas ]; then | ||
2296 | 15 | rm -rf /etc/bind/maas | ||
2297 | 16 | fi | ||
2298 | 17 | fi | ||
2299 | 18 | |||
2300 | 19 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
2301 | 20 | invoke-rc.d bind9 restart || true | ||
2302 | 21 | fi | ||
2303 | 22 | |||
2304 | 23 | #DEBHELPER# | ||
2305 | 0 | 24 | ||
2306 | === added file 'debian/maas-region-controller-min.apport' | |||
2307 | --- debian/maas-region-controller-min.apport 1970-01-01 00:00:00 +0000 | |||
2308 | +++ debian/maas-region-controller-min.apport 2014-07-15 21:22:45 +0000 | |||
2309 | @@ -0,0 +1,37 @@ | |||
2310 | 1 | #!/usr/bin/python | ||
2311 | 2 | |||
2312 | 3 | '''apport hook for maas-region-controller | ||
2313 | 4 | |||
2314 | 5 | (c) 2012 Canonical Ltd. | ||
2315 | 6 | Author: Andres Rodriguez <andres.rodriguez@canonical.com> | ||
2316 | 7 | |||
2317 | 8 | This program is free software; you can redistribute it and/or modify it | ||
2318 | 9 | under the terms of the GNU General Public License as published by the | ||
2319 | 10 | Free Software Foundation; either version 2 of the License, or (at your | ||
2320 | 11 | option) any later version. See http://www.gnu.org/copyleft/gpl.html for | ||
2321 | 12 | the full text of the license. | ||
2322 | 13 | ''' | ||
2323 | 14 | |||
2324 | 15 | from apport.hookutils import * | ||
2325 | 16 | |||
2326 | 17 | def add_info(report, ui): | ||
2327 | 18 | response = ui.yesno("The contents of your /etc/maas/maas_local_settings.py, " | ||
2328 | 19 | "/etc/maas/txlongpoll.yaml, /etc/maas/pserv.yaml files " | ||
2329 | 20 | "may help developers diagnose your bug more " | ||
2330 | 21 | "quickly. However, it may contain sensitive " | ||
2331 | 22 | "information. Do you want to include it in your " | ||
2332 | 23 | "bug report?") | ||
2333 | 24 | |||
2334 | 25 | if response == None: # user cancelled | ||
2335 | 26 | raise StopIteration | ||
2336 | 27 | |||
2337 | 28 | elif response == True: | ||
2338 | 29 | attach_conffiles(report,'maas') | ||
2339 | 30 | |||
2340 | 31 | # Attaching log files | ||
2341 | 32 | attach_file_if_exists(report, '/var/log/maas/maas.log', 'MAASLog') | ||
2342 | 33 | attach_file_if_exists(report, '/var/log/maas/pserv.log', 'MAASPservLog') | ||
2343 | 34 | attach_file_if_exists(report, '/var/log/maas/txlongpoll.log', 'MAAStxlongpollLog') | ||
2344 | 35 | |||
2345 | 36 | # Attaching related packages info | ||
2346 | 37 | attach_related_packages(report, ['python-django-maas', 'apparmor']) | ||
2347 | 0 | 38 | ||
2348 | === added file 'debian/maas-region-controller-min.dirs' | |||
2349 | --- debian/maas-region-controller-min.dirs 1970-01-01 00:00:00 +0000 | |||
2350 | +++ debian/maas-region-controller-min.dirs 2014-07-15 21:22:45 +0000 | |||
2351 | @@ -0,0 +1,1 @@ | |||
2352 | 1 | var/log/maas/oops | ||
2353 | 0 | 2 | ||
2354 | === added file 'debian/maas-region-controller-min.install' | |||
2355 | --- debian/maas-region-controller-min.install 1970-01-01 00:00:00 +0000 | |||
2356 | +++ debian/maas-region-controller-min.install 2014-07-15 21:22:45 +0000 | |||
2357 | @@ -0,0 +1,40 @@ | |||
2358 | 1 | # Install project | ||
2359 | 2 | debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas | ||
2360 | 3 | |||
2361 | 4 | # Install static files | ||
2362 | 5 | debian/tmp/usr/share/maas/web/static | ||
2363 | 6 | |||
2364 | 7 | # Install Apache Config | ||
2365 | 8 | debian/tmp/etc/maas/maas-http.conf | ||
2366 | 9 | |||
2367 | 10 | # Install MAAS local settings | ||
2368 | 11 | debian/tmp/etc/maas/maas_local_settings.py | ||
2369 | 12 | |||
2370 | 13 | # Install celery config file | ||
2371 | 14 | debian/tmp/usr/share/maas/celeryconfig.py | ||
2372 | 15 | |||
2373 | 16 | # Install local celery region config file | ||
2374 | 17 | debian/tmp/etc/maas/maas_local_celeryconfig.py | ||
2375 | 18 | |||
2376 | 19 | # Install WSGI | ||
2377 | 20 | debian/tmp/usr/share/maas/wsgi.py | ||
2378 | 21 | |||
2379 | 22 | # Install txlongpoll config file | ||
2380 | 23 | debian/tmp/etc/maas/txlongpoll.yaml | ||
2381 | 24 | |||
2382 | 25 | # Install new preseed files | ||
2383 | 26 | debian/tmp/etc/maas/preseeds | ||
2384 | 27 | |||
2385 | 28 | # Install templates | ||
2386 | 29 | debian/tmp/etc/maas/templates/dns | ||
2387 | 30 | debian/tmp/etc/maas/templates/commissioning-user-data | ||
2388 | 31 | |||
2389 | 32 | # Install driver configuration file | ||
2390 | 33 | debian/tmp/etc/maas/drivers.yaml | ||
2391 | 34 | |||
2392 | 35 | # Install all other stuff | ||
2393 | 36 | debian/extras/maas-region-admin usr/sbin | ||
2394 | 37 | debian/extras/maas-region-celeryd usr/sbin | ||
2395 | 38 | debian/extras/20-maas.conf etc/rsyslog.d | ||
2396 | 39 | debian/extras/maas_remote_syslog_compress etc/cron.d | ||
2397 | 40 | debian/extras/99-maas usr/share/maas/conf | ||
2398 | 0 | 41 | ||
2399 | === added file 'debian/maas-region-controller-min.links' | |||
2400 | --- debian/maas-region-controller-min.links 1970-01-01 00:00:00 +0000 | |||
2401 | +++ debian/maas-region-controller-min.links 2014-07-15 21:22:45 +0000 | |||
2402 | @@ -0,0 +1,2 @@ | |||
2403 | 1 | etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py | ||
2404 | 2 | etc/maas/maas_local_celeryconfig.py usr/share/maas/maas_local_celeryconfig.py | ||
2405 | 0 | 3 | ||
2406 | === added file 'debian/maas-region-controller-min.lintian-overrides' | |||
2407 | --- debian/maas-region-controller-min.lintian-overrides 1970-01-01 00:00:00 +0000 | |||
2408 | +++ debian/maas-region-controller-min.lintian-overrides 2014-07-15 21:22:45 +0000 | |||
2409 | @@ -0,0 +1,6 @@ | |||
2410 | 1 | maas-region-controller: binary-without-manpage usr/sbin/maas | ||
2411 | 2 | maas-region-controller: binary-without-manpage usr/sbin/maas-region-celeryd | ||
2412 | 3 | maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py | ||
2413 | 4 | maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py | ||
2414 | 5 | maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template | ||
2415 | 6 | maas-region-controller: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py | ||
2416 | 0 | 7 | ||
2417 | === added file 'debian/maas-region-controller-min.logrotate' | |||
2418 | --- debian/maas-region-controller-min.logrotate 1970-01-01 00:00:00 +0000 | |||
2419 | +++ debian/maas-region-controller-min.logrotate 2014-07-15 21:22:45 +0000 | |||
2420 | @@ -0,0 +1,18 @@ | |||
2421 | 1 | /var/log/maas/maas.log { | ||
2422 | 2 | rotate 5 | ||
2423 | 3 | weekly | ||
2424 | 4 | compress | ||
2425 | 5 | copytruncate | ||
2426 | 6 | missingok | ||
2427 | 7 | #create 620 root www-data | ||
2428 | 8 | } | ||
2429 | 9 | |||
2430 | 10 | /var/log/maas/txlongpoll.log { | ||
2431 | 11 | rotate 5 | ||
2432 | 12 | weekly | ||
2433 | 13 | compress | ||
2434 | 14 | missingok | ||
2435 | 15 | postrotate | ||
2436 | 16 | [ -r /var/run/maas-txlongpoll.pid ] && kill -s USR2 $(cat /var/run/maas-txlongpoll.pid) || true | ||
2437 | 17 | endscript | ||
2438 | 18 | } | ||
2439 | 0 | 19 | ||
2440 | === added file 'debian/maas-region-controller-min.maas-region-celery.upstart' | |||
2441 | --- debian/maas-region-controller-min.maas-region-celery.upstart 1970-01-01 00:00:00 +0000 | |||
2442 | +++ debian/maas-region-controller-min.maas-region-celery.upstart 2014-07-15 21:22:45 +0000 | |||
2443 | @@ -0,0 +1,27 @@ | |||
2444 | 1 | # maas-celery - celery daemon for the region controller | ||
2445 | 2 | # | ||
2446 | 3 | # MAAS Region Controller Celery Daemon | ||
2447 | 4 | |||
2448 | 5 | description "MAAS" | ||
2449 | 6 | author "Raphael Badin <raphael.badin@canonical.com>" | ||
2450 | 7 | |||
2451 | 8 | start on filesystem and net-device-up and rabbitmq-server-running | ||
2452 | 9 | stop on runlevel [016] | ||
2453 | 10 | |||
2454 | 11 | respawn | ||
2455 | 12 | |||
2456 | 13 | env workers_user="maas_workers" | ||
2457 | 14 | env workers_pass="" | ||
2458 | 15 | env workers_vhost="/maas_workers" | ||
2459 | 16 | env DJANGO_SETTINGS_MODULE="maas.settings" | ||
2460 | 17 | |||
2461 | 18 | pre-start script | ||
2462 | 19 | if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$workers_user" 1>/dev/null 2>&1; then | ||
2463 | 20 | workers_pass=`grep "maas_workers" /etc/maas/maas_local_celeryconfig.py | cut -d':' -f3 | cut -d'@' -f1` | ||
2464 | 21 | /usr/sbin/rabbitmqctl add_user "$workers_user" "$workers_pass" | ||
2465 | 22 | /usr/sbin/rabbitmqctl add_vhost "$workers_vhost" | ||
2466 | 23 | /usr/sbin/rabbitmqctl set_permissions -p "$workers_vhost" "$workers_user" ".*" ".*" ".*" | ||
2467 | 24 | fi | ||
2468 | 25 | end script | ||
2469 | 26 | |||
2470 | 27 | exec /usr/sbin/maas-region-celeryd --logfile=/var/log/maas/celery-region.log --schedule=/var/lib/maas/celerybeat-region-schedule --user=maas --group=maas | ||
2471 | 0 | 28 | ||
2472 | === added file 'debian/maas-region-controller-min.maas-txlongpoll.upstart' | |||
2473 | --- debian/maas-region-controller-min.maas-txlongpoll.upstart 1970-01-01 00:00:00 +0000 | |||
2474 | +++ debian/maas-region-controller-min.maas-txlongpoll.upstart 2014-07-15 21:22:45 +0000 | |||
2475 | @@ -0,0 +1,27 @@ | |||
2476 | 1 | # maas - txlongpoll service | ||
2477 | 2 | # | ||
2478 | 3 | # MAAS Provisioning Service txlongpoll | ||
2479 | 4 | |||
2480 | 5 | description "MAAS txlongpoll" | ||
2481 | 6 | author "Andres Rodriguez <andres.rodriguez@canonical.com>" | ||
2482 | 7 | |||
2483 | 8 | start on filesystem and net-device-up and rabbitmq-server-running | ||
2484 | 9 | stop on runlevel [016] | ||
2485 | 10 | |||
2486 | 11 | respawn | ||
2487 | 12 | |||
2488 | 13 | env longpoll_user="maas_longpoll" | ||
2489 | 14 | env longpoll_pass="" | ||
2490 | 15 | env longpoll_vhost="/maas_longpoll" | ||
2491 | 16 | |||
2492 | 17 | pre-start script | ||
2493 | 18 | if [ -f /usr/sbin/rabbitmqctl ] && ! /usr/sbin/rabbitmqctl list_user_permissions "$longpoll_user" 1>/dev/null 2>&1; then | ||
2494 | 19 | longpoll_pass=`/bin/grep "password" /etc/maas/txlongpoll.yaml | cut -d'"' -f2` | ||
2495 | 20 | /usr/sbin/rabbitmqctl add_user "$longpoll_user" "$longpoll_pass" | ||
2496 | 21 | /usr/sbin/rabbitmqctl add_vhost "$longpoll_vhost" | ||
2497 | 22 | /usr/sbin/rabbitmqctl set_permissions -p "$longpoll_vhost" "$longpoll_user" ".*" ".*" ".*" | ||
2498 | 23 | fi | ||
2499 | 24 | end script | ||
2500 | 25 | |||
2501 | 26 | # To add options to your daemon, edit the line below: | ||
2502 | 27 | exec /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-txlongpoll.pid --logfile=/dev/null txlongpoll --config-file=/etc/maas/txlongpoll.yaml | ||
2503 | 0 | 28 | ||
2504 | === added file 'debian/maas-region-controller-min.postinst' | |||
2505 | --- debian/maas-region-controller-min.postinst 1970-01-01 00:00:00 +0000 | |||
2506 | +++ debian/maas-region-controller-min.postinst 2014-07-15 21:22:45 +0000 | |||
2507 | @@ -0,0 +1,170 @@ | |||
2508 | 1 | #!/bin/sh | ||
2509 | 2 | |||
2510 | 3 | set -e | ||
2511 | 4 | |||
2512 | 5 | . /usr/share/debconf/confmodule | ||
2513 | 6 | db_version 2.0 | ||
2514 | 7 | |||
2515 | 8 | RELEASE=`lsb_release -rs` || RELEASE="" | ||
2516 | 9 | |||
2517 | 10 | restart_squid_deb_proxy() { | ||
2518 | 11 | invoke-rc.d squid-deb-proxy restart || true | ||
2519 | 12 | } | ||
2520 | 13 | |||
2521 | 14 | configure_region_http() { | ||
2522 | 15 | case $RELEASE in | ||
2523 | 16 | 12.04|12.10|13.04) | ||
2524 | 17 | # handle apache configs | ||
2525 | 18 | if [ -e /etc/maas/maas-http.conf -a \ | ||
2526 | 19 | ! -e /etc/apache2/conf.d/maas-http.conf ]; then | ||
2527 | 20 | ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf | ||
2528 | 21 | fi | ||
2529 | 22 | ;; | ||
2530 | 23 | *) | ||
2531 | 24 | # handle apache configs | ||
2532 | 25 | if [ -e /etc/maas/maas-http.conf -a \ | ||
2533 | 26 | ! -e /etc/apache2/conf-enabled/maas-http.conf ]; then | ||
2534 | 27 | ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf | ||
2535 | 28 | fi | ||
2536 | 29 | ;; | ||
2537 | 30 | esac | ||
2538 | 31 | # enable apache modules needed | ||
2539 | 32 | a2enmod proxy_http | ||
2540 | 33 | a2enmod expires | ||
2541 | 34 | a2enmod wsgi | ||
2542 | 35 | } | ||
2543 | 36 | |||
2544 | 37 | configure_maas_default_url() { | ||
2545 | 38 | local ipaddr="$1" | ||
2546 | 39 | |||
2547 | 40 | if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then | ||
2548 | 41 | sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/$ipaddr\/MAAS\"/" /etc/maas/maas_local_settings.py | ||
2549 | 42 | fi | ||
2550 | 43 | } | ||
2551 | 44 | |||
2552 | 45 | get_default_route_ip() { | ||
2553 | 46 | while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do | ||
2554 | 47 | [ "$Mask" = "00000000" ] && break | ||
2555 | 48 | done < /proc/net/route | ||
2556 | 49 | interface="$Iface" | ||
2557 | 50 | ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global) | ||
2558 | 51 | ipaddr=${ipaddr#* inet } | ||
2559 | 52 | ipaddr=${ipaddr%%/*} | ||
2560 | 53 | echo $ipaddr | ||
2561 | 54 | } | ||
2562 | 55 | |||
2563 | 56 | configure_maas_squid_deb_proxy() { | ||
2564 | 57 | local ipaddr="$1" | ||
2565 | 58 | |||
2566 | 59 | if [ -e /usr/share/maas/conf/99-maas -a \ | ||
2567 | 60 | ! -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then | ||
2568 | 61 | ln -sf /usr/share/maas/conf/99-maas \ | ||
2569 | 62 | /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas | ||
2570 | 63 | fi | ||
2571 | 64 | |||
2572 | 65 | sed -i "s/\(^[a-zA-Z0-9\.\-].*\) # maasurl$/$ipaddr # maasurl/" \ | ||
2573 | 66 | /usr/share/maas/conf/99-maas | ||
2574 | 67 | } | ||
2575 | 68 | |||
2576 | 69 | # Please keep this stanza until 14.10 | ||
2577 | 70 | if [ "$1" = "configure" ]; then | ||
2578 | 71 | if dpkg --compare-versions "$2" le-nl 1.5+bzr1909-0ubuntu1 ; then | ||
2579 | 72 | chown root:maas /etc/maas/txlongpoll.yaml | ||
2580 | 73 | chmod 0640 /etc/maas/txlongpoll.yaml | ||
2581 | 74 | fi | ||
2582 | 75 | fi | ||
2583 | 76 | |||
2584 | 77 | if [ "$1" = "configure" ] && [ -z "$2" ]; then | ||
2585 | 78 | ######################################################### | ||
2586 | 79 | ################ Folder Permissions #################### | ||
2587 | 80 | ######################################################### | ||
2588 | 81 | mkdir -p /var/lib/maas/media/storage | ||
2589 | 82 | chown -R maas:maas /var/lib/maas/ | ||
2590 | 83 | |||
2591 | 84 | # Config will contain credentials, so should be readable | ||
2592 | 85 | # by the application but nobody else. | ||
2593 | 86 | chown root:maas \ | ||
2594 | 87 | /etc/maas/maas_local_celeryconfig.py \ | ||
2595 | 88 | /etc/maas/maas_local_settings.py \ | ||
2596 | 89 | /etc/maas/txlongpoll.yaml | ||
2597 | 90 | chmod 0640 \ | ||
2598 | 91 | /etc/maas/maas_local_celeryconfig.py \ | ||
2599 | 92 | /etc/maas/maas_local_settings.py \ | ||
2600 | 93 | /etc/maas/txlongpoll.yaml | ||
2601 | 94 | |||
2602 | 95 | ######################################################### | ||
2603 | 96 | ################ Configure Apache2 #################### | ||
2604 | 97 | ######################################################### | ||
2605 | 98 | configure_region_http | ||
2606 | 99 | |||
2607 | 100 | ######################################################### | ||
2608 | 101 | ########## Configure DEFAULT_MAAS_URL ################# | ||
2609 | 102 | ######################################################### | ||
2610 | 103 | |||
2611 | 104 | # Obtain IP address of default route and change DEFAULT_MAAS_URL | ||
2612 | 105 | # if default-maas-url has not been preseeded. | ||
2613 | 106 | db_get maas/default-maas-url | ||
2614 | 107 | ipaddr="$RET" | ||
2615 | 108 | if [ -z "$RET" ]; then | ||
2616 | 109 | ipaddr=$(get_default_route_ip) | ||
2617 | 110 | fi | ||
2618 | 111 | # Set the IP address of the interface with default route | ||
2619 | 112 | if [ -n "$ipaddr" ]; then | ||
2620 | 113 | configure_maas_default_url "$ipaddr" | ||
2621 | 114 | configure_maas_squid_deb_proxy "$ipaddr" | ||
2622 | 115 | db_set maas/default-maas-url "$ipaddr" | ||
2623 | 116 | fi | ||
2624 | 117 | |||
2625 | 118 | ######################################################### | ||
2626 | 119 | ################ Configure Logging #################### | ||
2627 | 120 | ######################################################### | ||
2628 | 121 | |||
2629 | 122 | # Give appropriate permissions | ||
2630 | 123 | if [ ! -f /var/log/maas/maas.log ]; then | ||
2631 | 124 | touch /var/log/maas/maas.log | ||
2632 | 125 | fi | ||
2633 | 126 | chown -R maas:maas /var/log/maas | ||
2634 | 127 | chmod -R 775 /var/log/maas/oops | ||
2635 | 128 | |||
2636 | 129 | # Create log directory base | ||
2637 | 130 | mkdir -p /var/log/maas/rsyslog | ||
2638 | 131 | chown -R syslog:syslog /var/log/maas/rsyslog | ||
2639 | 132 | # Make sure rsyslog reads our config | ||
2640 | 133 | invoke-rc.d rsyslog restart | ||
2641 | 134 | |||
2642 | 135 | ######################################################### | ||
2643 | 136 | ################### Squid-deb-proxy #################### | ||
2644 | 137 | ######################################################### | ||
2645 | 138 | # Make sure squid-deb-proxy reads our config (99-maas) | ||
2646 | 139 | restart_squid_deb_proxy | ||
2647 | 140 | |||
2648 | 141 | elif [ -n "$DEBCONF_RECONFIGURE" ]; then | ||
2649 | 142 | # Set the IP address of the interface with default route | ||
2650 | 143 | db_get maas/default-maas-url | ||
2651 | 144 | ipaddr="$RET" | ||
2652 | 145 | if [ -n "$ipaddr" ]; then | ||
2653 | 146 | configure_maas_default_url "$ipaddr" | ||
2654 | 147 | configure_maas_squid_deb_proxy "$ipaddr" | ||
2655 | 148 | fi | ||
2656 | 149 | |||
2657 | 150 | elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then | ||
2658 | 151 | # If upgrading to any later package version, then upgrade db. | ||
2659 | 152 | invoke-rc.d apache2 stop || true | ||
2660 | 153 | |||
2661 | 154 | # make sure maas http config is symlinked | ||
2662 | 155 | configure_region_http | ||
2663 | 156 | |||
2664 | 157 | # we need to regenerate the passwords and update configs. | ||
2665 | 158 | db_get maas/default-maas-url | ||
2666 | 159 | ipaddr="$RET" | ||
2667 | 160 | configure_maas_default_url "$ipaddr" | ||
2668 | 161 | configure_maas_squid_deb_proxy "$ipaddr" | ||
2669 | 162 | fi | ||
2670 | 163 | |||
2671 | 164 | invoke-rc.d apache2 restart || true | ||
2672 | 165 | |||
2673 | 166 | restart_squid_deb_proxy | ||
2674 | 167 | |||
2675 | 168 | db_stop | ||
2676 | 169 | |||
2677 | 170 | #DEBHELPER# | ||
2678 | 0 | 171 | ||
2679 | === added file 'debian/maas-region-controller-min.postrm' | |||
2680 | --- debian/maas-region-controller-min.postrm 1970-01-01 00:00:00 +0000 | |||
2681 | +++ debian/maas-region-controller-min.postrm 2014-07-15 21:22:45 +0000 | |||
2682 | @@ -0,0 +1,39 @@ | |||
2683 | 1 | #!/bin/sh | ||
2684 | 2 | |||
2685 | 3 | set -e | ||
2686 | 4 | |||
2687 | 5 | . /usr/share/debconf/confmodule | ||
2688 | 6 | |||
2689 | 7 | RELEASE=`lsb_release -rs` || RELEASE="" | ||
2690 | 8 | |||
2691 | 9 | case "$1" in | ||
2692 | 10 | purge) | ||
2693 | 11 | rm -rf /var/log/maas | ||
2694 | 12 | rm -rf /var/lib/maas | ||
2695 | 13 | case $RELEASE in | ||
2696 | 14 | 12.04|12.10|13.04) | ||
2697 | 15 | if [ -h /etc/apache2/conf.d/maas-http.conf ]; then | ||
2698 | 16 | rm -rf /etc/apache2/conf.d/maas-http.conf | ||
2699 | 17 | fi | ||
2700 | 18 | ;; | ||
2701 | 19 | *) | ||
2702 | 20 | if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then | ||
2703 | 21 | rm -rf /etc/apache2/conf-enabled/maas-http.conf | ||
2704 | 22 | fi | ||
2705 | 23 | ;; | ||
2706 | 24 | esac | ||
2707 | 25 | |||
2708 | 26 | # Restarting apache2 | ||
2709 | 27 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
2710 | 28 | invoke-rc.d apache2 restart || true | ||
2711 | 29 | fi | ||
2712 | 30 | |||
2713 | 31 | # Delete symlink | ||
2714 | 32 | if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then | ||
2715 | 33 | rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas | ||
2716 | 34 | fi | ||
2717 | 35 | esac | ||
2718 | 36 | |||
2719 | 37 | #DEBHELPER# | ||
2720 | 38 | |||
2721 | 39 | db_stop | ||
2722 | 0 | 40 | ||
2723 | === added file 'debian/maas-region-controller-min.prerm' | |||
2724 | --- debian/maas-region-controller-min.prerm 1970-01-01 00:00:00 +0000 | |||
2725 | +++ debian/maas-region-controller-min.prerm 2014-07-15 21:22:45 +0000 | |||
2726 | @@ -0,0 +1,9 @@ | |||
2727 | 1 | #!/bin/sh | ||
2728 | 2 | |||
2729 | 3 | set -e | ||
2730 | 4 | |||
2731 | 5 | . /usr/share/debconf/confmodule | ||
2732 | 6 | |||
2733 | 7 | #DEBHELPER# | ||
2734 | 8 | |||
2735 | 9 | invoke-rc.d apache2 stop || true | ||
2736 | 0 | 10 | ||
2737 | === added file 'debian/maas-region-controller-min.templates' | |||
2738 | --- debian/maas-region-controller-min.templates 1970-01-01 00:00:00 +0000 | |||
2739 | +++ debian/maas-region-controller-min.templates 2014-07-15 21:22:45 +0000 | |||
2740 | @@ -0,0 +1,22 @@ | |||
2741 | 1 | Template: maas/installation-note | ||
2742 | 2 | Type: note | ||
2743 | 3 | Default: false | ||
2744 | 4 | _Description: Ubuntu MAAS Server | ||
2745 | 5 | The Ubuntu MAAS Server has been installed in your system. You | ||
2746 | 6 | can access the MAAS Web interface here: | ||
2747 | 7 | . | ||
2748 | 8 | http://${MAAS_URL}/MAAS | ||
2749 | 9 | . | ||
2750 | 10 | If the automatically detected address above is not in the same | ||
2751 | 11 | network as the MAAS clients, you need to reconfigure it: | ||
2752 | 12 | . | ||
2753 | 13 | sudo dpkg-reconfigure maas-region-controller | ||
2754 | 14 | |||
2755 | 15 | Template: maas/default-maas-url | ||
2756 | 16 | Type: string | ||
2757 | 17 | _Description: Ubuntu MAAS PXE/Provisioning network address: | ||
2758 | 18 | The Ubuntu MAAS Server automatically detects the IP address | ||
2759 | 19 | that is used for PXE and provisioning. However, it needs to be | ||
2760 | 20 | in the same network as the clients. If the automatically | ||
2761 | 21 | detected address is not in the same network as the clients, it | ||
2762 | 22 | must be changed. | ||
2763 | 0 | 23 | ||
2764 | === added file 'debian/maas-region-controller.config' | |||
2765 | --- debian/maas-region-controller.config 1970-01-01 00:00:00 +0000 | |||
2766 | +++ debian/maas-region-controller.config 2014-07-15 21:22:45 +0000 | |||
2767 | @@ -0,0 +1,45 @@ | |||
2768 | 1 | #!/bin/sh | ||
2769 | 2 | |||
2770 | 3 | set -e | ||
2771 | 4 | |||
2772 | 5 | . /usr/share/debconf/confmodule | ||
2773 | 6 | db_version 2.0 | ||
2774 | 7 | |||
2775 | 8 | # creates question | ||
2776 | 9 | set_question() { | ||
2777 | 10 | if ! db_fget "$1" seen; then | ||
2778 | 11 | db_register dbconfig-common/dbconfig-install "$1" | ||
2779 | 12 | db_subst "$1" ID "$1" | ||
2780 | 13 | db_fget "$1" seen | ||
2781 | 14 | fi | ||
2782 | 15 | if [ "$RET" = false ]; then | ||
2783 | 16 | db_set "$1" "$2" | ||
2784 | 17 | db_fset "$1" seen true | ||
2785 | 18 | fi | ||
2786 | 19 | } | ||
2787 | 20 | |||
2788 | 21 | # source dbconfig-common shell library, and call the hook function | ||
2789 | 22 | if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then | ||
2790 | 23 | . /usr/share/dbconfig-common/dpkg/config.pgsql | ||
2791 | 24 | fi | ||
2792 | 25 | |||
2793 | 26 | if [ "$1" = "configure" ] && [ -z "$2" ]; then | ||
2794 | 27 | # Hide maas/dbconfig-install question by setting default. | ||
2795 | 28 | set_question maas-region-controller/dbconfig-install true | ||
2796 | 29 | set_question maas-region-controller/pgsql/app-pass "" | ||
2797 | 30 | |||
2798 | 31 | dbc_dbname="maasdb" | ||
2799 | 32 | dbc_dbuser="maas" | ||
2800 | 33 | dbc_remove="true" | ||
2801 | 34 | |||
2802 | 35 | dbc_go maas-region-controller $@ | ||
2803 | 36 | |||
2804 | 37 | elif [ -n "$DEBCONF_RECONFIGURE" ]; then | ||
2805 | 38 | db_get maas/default-maas-url || true | ||
2806 | 39 | if [ -z "$RET" ]; then | ||
2807 | 40 | ipaddr=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"/")} END{print array[3] }' /etc/maas/maas_local_settings.py) | ||
2808 | 41 | db_set maas/default-maas-url "$ipaddr" | ||
2809 | 42 | fi | ||
2810 | 43 | db_input low maas/default-maas-url || true | ||
2811 | 44 | db_go | ||
2812 | 45 | fi | ||
2813 | 0 | 46 | ||
2814 | === added file 'debian/maas-region-controller.postinst' | |||
2815 | --- debian/maas-region-controller.postinst 1970-01-01 00:00:00 +0000 | |||
2816 | +++ debian/maas-region-controller.postinst 2014-07-15 21:22:45 +0000 | |||
2817 | @@ -0,0 +1,301 @@ | |||
2818 | 1 | #!/bin/sh | ||
2819 | 2 | |||
2820 | 3 | set -e | ||
2821 | 4 | |||
2822 | 5 | . /usr/share/debconf/confmodule | ||
2823 | 6 | db_version 2.0 | ||
2824 | 7 | |||
2825 | 8 | if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then | ||
2826 | 9 | . /usr/share/dbconfig-common/dpkg/postinst.pgsql | ||
2827 | 10 | fi | ||
2828 | 11 | |||
2829 | 12 | RELEASE=`lsb_release -rs` || RELEASE="" | ||
2830 | 13 | |||
2831 | 14 | maas_sync_migrate_db(){ | ||
2832 | 15 | maas-region-admin syncdb --noinput | ||
2833 | 16 | maas-region-admin migrate maasserver --noinput | ||
2834 | 17 | maas-region-admin migrate metadataserver --noinput | ||
2835 | 18 | } | ||
2836 | 19 | |||
2837 | 20 | restart_rabbitmq(){ | ||
2838 | 21 | invoke-rc.d rabbitmq-server restart || true | ||
2839 | 22 | } | ||
2840 | 23 | |||
2841 | 24 | restart_postgresql(){ | ||
2842 | 25 | invoke-rc.d --force postgresql restart || true | ||
2843 | 26 | } | ||
2844 | 27 | |||
2845 | 28 | restart_squid_deb_proxy() { | ||
2846 | 29 | invoke-rc.d squid-deb-proxy restart || true | ||
2847 | 30 | } | ||
2848 | 31 | |||
2849 | 32 | configure_region_http() { | ||
2850 | 33 | case $RELEASE in | ||
2851 | 34 | 12.04|12.10|13.04) | ||
2852 | 35 | # handle apache configs | ||
2853 | 36 | if [ -e /etc/maas/maas-http.conf -a \ | ||
2854 | 37 | ! -e /etc/apache2/conf.d/maas-http.conf ]; then | ||
2855 | 38 | ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf | ||
2856 | 39 | fi | ||
2857 | 40 | ;; | ||
2858 | 41 | *) | ||
2859 | 42 | # handle apache configs | ||
2860 | 43 | if [ -e /etc/maas/maas-http.conf -a \ | ||
2861 | 44 | ! -e /etc/apache2/conf-enabled/maas-http.conf ]; then | ||
2862 | 45 | ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf | ||
2863 | 46 | fi | ||
2864 | 47 | ;; | ||
2865 | 48 | esac | ||
2866 | 49 | # enable apache modules needed | ||
2867 | 50 | a2enmod proxy_http | ||
2868 | 51 | a2enmod expires | ||
2869 | 52 | a2enmod wsgi | ||
2870 | 53 | } | ||
2871 | 54 | |||
2872 | 55 | configure_maas_txlongpoll_rabbitmq_user() { | ||
2873 | 56 | local longpoll_user="maas_longpoll" | ||
2874 | 57 | local longpoll_pass= | ||
2875 | 58 | local longpoll_vhost="/maas_longpoll" | ||
2876 | 59 | longpoll_pass="$(pwgen -s 20)" | ||
2877 | 60 | if [ -x /usr/sbin/rabbitmqctl ]; then | ||
2878 | 61 | if ! rabbitmqctl list_users | grep -qs "$longpoll_user"; then | ||
2879 | 62 | rabbitmqctl add_user "$longpoll_user" "$longpoll_pass" || true | ||
2880 | 63 | rabbitmqctl add_vhost "$longpoll_vhost" || true | ||
2881 | 64 | rabbitmqctl set_permissions -p "$longpoll_vhost" "$longpoll_user" ".*" ".*" ".*" || true | ||
2882 | 65 | else | ||
2883 | 66 | rabbitmqctl change_password "$longpoll_user" "$longpoll_pass" || true | ||
2884 | 67 | fi | ||
2885 | 68 | fi | ||
2886 | 69 | |||
2887 | 70 | if grep -qs "^\ \{1,\}password: \"[a-zA-Z0-9]\{0,\}\"$" /etc/maas/txlongpoll.yaml; then | ||
2888 | 71 | sed -i "s/^\ \{1,\}password: \"[a-zA-Z0-9]\{0,\}\"$/ password: \""$longpoll_pass"\"/" \ | ||
2889 | 72 | /etc/maas/txlongpoll.yaml | ||
2890 | 73 | fi | ||
2891 | 74 | if grep -qs "^RABBITMQ_PASSWORD\ \= '[a-zA-Z0-9]\{0,\}'$" /etc/maas/maas_local_settings.py; then | ||
2892 | 75 | sed -i "s/^RABBITMQ_PASSWORD\ \= '[a-zA-Z0-9]\{0,\}'$/RABBITMQ_PASSWORD = '"$longpoll_pass"'/" \ | ||
2893 | 76 | /etc/maas/maas_local_settings.py | ||
2894 | 77 | fi | ||
2895 | 78 | } | ||
2896 | 79 | |||
2897 | 80 | configure_maas_workers_rabbitmq_user() { | ||
2898 | 81 | local workers_user="maas_workers" | ||
2899 | 82 | local workers_pass="$(pwgen -s 20)" | ||
2900 | 83 | local workers_vhost="/maas_workers" | ||
2901 | 84 | local amqp_host="$1" | ||
2902 | 85 | if [ -z "$amqp_host" ]; then | ||
2903 | 86 | amqp_host="localhost" | ||
2904 | 87 | fi | ||
2905 | 88 | local amqp_port="5672" | ||
2906 | 89 | if [ -x /usr/sbin/rabbitmqctl ]; then | ||
2907 | 90 | if ! rabbitmqctl list_users | grep -qs "$workers_user"; then | ||
2908 | 91 | rabbitmqctl add_user "$workers_user" "$workers_pass" || true | ||
2909 | 92 | rabbitmqctl add_vhost "$workers_vhost" || true | ||
2910 | 93 | rabbitmqctl set_permissions -p "$workers_vhost" "$workers_user" ".*" ".*" ".*" || true | ||
2911 | 94 | else | ||
2912 | 95 | rabbitmqctl change_password "$workers_user" "$workers_pass" || true | ||
2913 | 96 | fi | ||
2914 | 97 | fi | ||
2915 | 98 | |||
2916 | 99 | if grep -qs "^BROKER_URL\ \= '.*'$" /etc/maas/maas_local_celeryconfig.py; then | ||
2917 | 100 | local broker_url="amqp://$workers_user:$workers_pass@$amqp_host:$amqp_port/$workers_vhost" | ||
2918 | 101 | sed -i "s|^BROKER_URL\ \= '.*'$|BROKER_URL = '"$broker_url"'|" \ | ||
2919 | 102 | /etc/maas/maas_local_celeryconfig.py | ||
2920 | 103 | fi | ||
2921 | 104 | } | ||
2922 | 105 | |||
2923 | 106 | configure_maas_database() { | ||
2924 | 107 | local dbc_dbpass="$1" | ||
2925 | 108 | if grep -qs "^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$" /etc/maas/maas_local_settings.py; then | ||
2926 | 109 | sed -i "s/^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$/ 'PASSWORD': '"$dbc_dbpass"',/" \ | ||
2927 | 110 | /etc/maas/maas_local_settings.py | ||
2928 | 111 | fi | ||
2929 | 112 | } | ||
2930 | 113 | |||
2931 | 114 | configure_maas_default_url() { | ||
2932 | 115 | local ipaddr="$1" | ||
2933 | 116 | |||
2934 | 117 | if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then | ||
2935 | 118 | sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/"$ipaddr"\/MAAS\"/" \ | ||
2936 | 119 | /etc/maas/maas_local_settings.py | ||
2937 | 120 | fi | ||
2938 | 121 | } | ||
2939 | 122 | |||
2940 | 123 | get_default_route_ip() { | ||
2941 | 124 | while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do | ||
2942 | 125 | [ "$Mask" = "00000000" ] && break | ||
2943 | 126 | done < /proc/net/route | ||
2944 | 127 | interface="$Iface" | ||
2945 | 128 | ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global) | ||
2946 | 129 | ipaddr=${ipaddr#* inet } | ||
2947 | 130 | ipaddr=${ipaddr%%/*} | ||
2948 | 131 | echo $ipaddr | ||
2949 | 132 | } | ||
2950 | 133 | |||
2951 | 134 | configure_maas_squid_deb_proxy() { | ||
2952 | 135 | local ipaddr="$1" | ||
2953 | 136 | |||
2954 | 137 | if [ -e /usr/share/maas/conf/99-maas -a \ | ||
2955 | 138 | ! -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then | ||
2956 | 139 | ln -sf /usr/share/maas/conf/99-maas \ | ||
2957 | 140 | /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas | ||
2958 | 141 | fi | ||
2959 | 142 | |||
2960 | 143 | sed -i "s/\(^[a-zA-Z0-9\.\-].*\) # maasurl$/$ipaddr # maasurl/" \ | ||
2961 | 144 | /usr/share/maas/conf/99-maas | ||
2962 | 145 | } | ||
2963 | 146 | |||
2964 | 147 | if [ "$1" = "configure" ] && [ -z "$2" ]; then | ||
2965 | 148 | ######################################################### | ||
2966 | 149 | ################ Folder Permissions #################### | ||
2967 | 150 | ######################################################### | ||
2968 | 151 | mkdir -p /var/lib/maas/media/storage | ||
2969 | 152 | chown -R maas:maas /var/lib/maas/ | ||
2970 | 153 | |||
2971 | 154 | # Config will contain credentials, so should be readable | ||
2972 | 155 | # by the application but nobody else. | ||
2973 | 156 | chown root:maas \ | ||
2974 | 157 | /etc/maas/maas_local_celeryconfig.py \ | ||
2975 | 158 | /etc/maas/maas_local_settings.py | ||
2976 | 159 | chmod 0640 \ | ||
2977 | 160 | /etc/maas/maas_local_celeryconfig.py \ | ||
2978 | 161 | /etc/maas/maas_local_settings.py | ||
2979 | 162 | |||
2980 | 163 | ######################################################### | ||
2981 | 164 | ################ Configure Apache2 #################### | ||
2982 | 165 | ######################################################### | ||
2983 | 166 | configure_region_http | ||
2984 | 167 | |||
2985 | 168 | ######################################################### | ||
2986 | 169 | ########## Configure DEFAULT_MAAS_URL ################# | ||
2987 | 170 | ######################################################### | ||
2988 | 171 | |||
2989 | 172 | # Obtain IP address of default route and change DEFAULT_MAAS_URL | ||
2990 | 173 | # if default-maas-url has not been preseeded. | ||
2991 | 174 | db_get maas/default-maas-url | ||
2992 | 175 | ipaddr="$RET" | ||
2993 | 176 | if [ -z "$RET" ]; then | ||
2994 | 177 | ipaddr=$(get_default_route_ip) | ||
2995 | 178 | fi | ||
2996 | 179 | # Set the IP address of the interface with default route | ||
2997 | 180 | if [ -n "$ipaddr" ]; then | ||
2998 | 181 | configure_maas_default_url "$ipaddr" | ||
2999 | 182 | configure_maas_squid_deb_proxy "$ipaddr" | ||
3000 | 183 | db_subst maas/installation-note MAAS_URL "$ipaddr" | ||
3001 | 184 | db_set maas/default-maas-url "$ipaddr" | ||
3002 | 185 | fi | ||
3003 | 186 | |||
3004 | 187 | ######################################################### | ||
3005 | 188 | ################ Configure Logging #################### | ||
3006 | 189 | ######################################################### | ||
3007 | 190 | |||
3008 | 191 | # Give appropriate permissions | ||
3009 | 192 | if [ ! -f /var/log/maas/maas.log ]; then | ||
3010 | 193 | touch /var/log/maas/maas.log | ||
3011 | 194 | fi | ||
3012 | 195 | chown -R maas:maas /var/log/maas | ||
3013 | 196 | chmod -R 775 /var/log/maas/oops | ||
3014 | 197 | |||
3015 | 198 | # Create log directory base | ||
3016 | 199 | mkdir -p /var/log/maas/rsyslog | ||
3017 | 200 | chown -R syslog:syslog /var/log/maas/rsyslog | ||
3018 | 201 | # Make sure rsyslog reads our config | ||
3019 | 202 | invoke-rc.d rsyslog restart | ||
3020 | 203 | |||
3021 | 204 | ######################################################### | ||
3022 | 205 | ################### Squid-deb-proxy #################### | ||
3023 | 206 | ######################################################### | ||
3024 | 207 | # Make sure squid-deb-proxy reads our config (99-maas) | ||
3025 | 208 | invoke-rc.d squid-deb-proxy restart | ||
3026 | 209 | |||
3027 | 210 | ######################################################### | ||
3028 | 211 | ########## Configure longpoll rabbitmq config ########### | ||
3029 | 212 | ######################################################### | ||
3030 | 213 | |||
3031 | 214 | # Handle longpoll/rabbitmq publishing | ||
3032 | 215 | restart_rabbitmq | ||
3033 | 216 | configure_maas_txlongpoll_rabbitmq_user | ||
3034 | 217 | |||
3035 | 218 | ######################################################### | ||
3036 | 219 | ########## Configure worker rabbitmq config ########### | ||
3037 | 220 | ######################################################### | ||
3038 | 221 | |||
3039 | 222 | # Handle celery/rabbitmq publishing | ||
3040 | 223 | configure_maas_workers_rabbitmq_user "$ipaddr" | ||
3041 | 224 | |||
3042 | 225 | ######################################################### | ||
3043 | 226 | ################ Configure Database ################### | ||
3044 | 227 | ######################################################### | ||
3045 | 228 | |||
3046 | 229 | # Need to for postgresql start so it doesn't fail on the installer | ||
3047 | 230 | restart_postgresql | ||
3048 | 231 | |||
3049 | 232 | # Create the database | ||
3050 | 233 | dbc_go maas-region-controller $@ | ||
3051 | 234 | configure_maas_database "$dbc_dbpass" | ||
3052 | 235 | |||
3053 | 236 | # Only syncdb if we have selected to install it with dbconfig-common. | ||
3054 | 237 | db_get maas-region-controller/dbconfig-install | ||
3055 | 238 | if [ "$RET" = "true" ]; then | ||
3056 | 239 | maas_sync_migrate_db | ||
3057 | 240 | fi | ||
3058 | 241 | |||
3059 | 242 | # Display installation note | ||
3060 | 243 | db_input low maas/installation-note || true | ||
3061 | 244 | db_go | ||
3062 | 245 | |||
3063 | 246 | elif [ -n "$DEBCONF_RECONFIGURE" ]; then | ||
3064 | 247 | # Set the IP address of the interface with default route | ||
3065 | 248 | db_get maas/default-maas-url | ||
3066 | 249 | ipaddr="$RET" | ||
3067 | 250 | if [ -n "$ipaddr" ]; then | ||
3068 | 251 | configure_maas_default_url "$ipaddr" | ||
3069 | 252 | configure_maas_squid_deb_proxy "$ipaddr" | ||
3070 | 253 | configure_maas_workers_rabbitmq_user "$ipaddr" | ||
3071 | 254 | fi | ||
3072 | 255 | configure_maas_txlongpoll_rabbitmq_user | ||
3073 | 256 | |||
3074 | 257 | elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then | ||
3075 | 258 | # If upgrading to any later package version, then upgrade db. | ||
3076 | 259 | invoke-rc.d apache2 stop || true | ||
3077 | 260 | |||
3078 | 261 | # make sure postgresql is running | ||
3079 | 262 | restart_postgresql | ||
3080 | 263 | |||
3081 | 264 | # make sure maas http config is symlinked | ||
3082 | 265 | configure_region_http | ||
3083 | 266 | |||
3084 | 267 | # we need to regenerate the passwords and update configs. | ||
3085 | 268 | db_get maas/default-maas-url | ||
3086 | 269 | ipaddr="$RET" | ||
3087 | 270 | configure_maas_default_url "$ipaddr" | ||
3088 | 271 | configure_maas_squid_deb_proxy "$ipaddr" | ||
3089 | 272 | # make sure rabbitmq is running | ||
3090 | 273 | restart_rabbitmq | ||
3091 | 274 | configure_maas_txlongpoll_rabbitmq_user | ||
3092 | 275 | # Handle celery/rabbitmq publishing | ||
3093 | 276 | configure_maas_workers_rabbitmq_user "$ipaddr" | ||
3094 | 277 | # handle database upgrade | ||
3095 | 278 | if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then | ||
3096 | 279 | # source dbconfig-common db config for maas-region-controller | ||
3097 | 280 | # before upgrading database, otherwise a new config is written | ||
3098 | 281 | # but the password is no longer preserved. | ||
3099 | 282 | . /etc/dbconfig-common/maas-region-controller.conf | ||
3100 | 283 | else | ||
3101 | 284 | dbc_go maas-region-controller $@ | ||
3102 | 285 | fi | ||
3103 | 286 | configure_maas_database "$dbc_dbpass" | ||
3104 | 287 | |||
3105 | 288 | maas_sync_migrate_db | ||
3106 | 289 | |||
3107 | 290 | fi | ||
3108 | 291 | |||
3109 | 292 | invoke-rc.d apache2 restart || true | ||
3110 | 293 | |||
3111 | 294 | restart_squid_deb_proxy | ||
3112 | 295 | |||
3113 | 296 | invoke-rc.d maas-txlongpoll restart || true | ||
3114 | 297 | invoke-rc.d maas-region-celery restart || true | ||
3115 | 298 | |||
3116 | 299 | db_stop | ||
3117 | 300 | |||
3118 | 301 | #DEBHELPER# | ||
3119 | 0 | 302 | ||
3120 | === added file 'debian/maas-region-controller.postrm' | |||
3121 | --- debian/maas-region-controller.postrm 1970-01-01 00:00:00 +0000 | |||
3122 | +++ debian/maas-region-controller.postrm 2014-07-15 21:22:45 +0000 | |||
3123 | @@ -0,0 +1,59 @@ | |||
3124 | 1 | #!/bin/sh | ||
3125 | 2 | |||
3126 | 3 | set -e | ||
3127 | 4 | |||
3128 | 5 | . /usr/share/debconf/confmodule | ||
3129 | 6 | |||
3130 | 7 | RELEASE=`lsb_release -rs` || RELEASE="" | ||
3131 | 8 | |||
3132 | 9 | if [ -f /etc/dbconfig-common/maas.conf ]; then | ||
3133 | 10 | if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then | ||
3134 | 11 | . /usr/share/dbconfig-common/dpkg/postrm.pgsql | ||
3135 | 12 | dbc_go maas-region-controller $@ | ||
3136 | 13 | fi | ||
3137 | 14 | fi | ||
3138 | 15 | |||
3139 | 16 | case "$1" in | ||
3140 | 17 | purge) | ||
3141 | 18 | rm -rf /var/log/maas | ||
3142 | 19 | rm -rf /var/lib/maas | ||
3143 | 20 | case $RELEASE in | ||
3144 | 21 | 12.04|12.10|13.04) | ||
3145 | 22 | if [ -h /etc/apache2/conf.d/maas-http.conf ]; then | ||
3146 | 23 | rm -rf /etc/apache2/conf.d/maas-http.conf | ||
3147 | 24 | fi | ||
3148 | 25 | ;; | ||
3149 | 26 | *) | ||
3150 | 27 | if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then | ||
3151 | 28 | rm -rf /etc/apache2/conf-enabled/maas-http.conf | ||
3152 | 29 | fi | ||
3153 | 30 | ;; | ||
3154 | 31 | esac | ||
3155 | 32 | |||
3156 | 33 | # Restarting apache2 | ||
3157 | 34 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
3158 | 35 | invoke-rc.d apache2 restart || true | ||
3159 | 36 | fi | ||
3160 | 37 | |||
3161 | 38 | # Delete symlink | ||
3162 | 39 | if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then | ||
3163 | 40 | rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas | ||
3164 | 41 | fi | ||
3165 | 42 | |||
3166 | 43 | # Remove rabbitmq/longpoll/celery | ||
3167 | 44 | longpoll_user="maas_longpoll" | ||
3168 | 45 | longpoll_vhost="/maas_longpoll" | ||
3169 | 46 | workers_user="maas_workers" | ||
3170 | 47 | workers_vhost="/maas_workers" | ||
3171 | 48 | if [ -x /usr/sbin/rabbitmqctl ]; then | ||
3172 | 49 | rabbitmqctl delete_vhost "$longpoll_vhost" || true | ||
3173 | 50 | rabbitmqctl delete_user "$longpoll_user" || true | ||
3174 | 51 | |||
3175 | 52 | rabbitmqctl delete_vhost "$workers_vhost" || true | ||
3176 | 53 | rabbitmqctl delete_user "$workers_user" || true | ||
3177 | 54 | fi | ||
3178 | 55 | esac | ||
3179 | 56 | |||
3180 | 57 | #DEBHELPER# | ||
3181 | 58 | |||
3182 | 59 | db_stop | ||
3183 | 0 | 60 | ||
3184 | === added file 'debian/maas-region-controller.prerm' | |||
3185 | --- debian/maas-region-controller.prerm 1970-01-01 00:00:00 +0000 | |||
3186 | +++ debian/maas-region-controller.prerm 2014-07-15 21:22:45 +0000 | |||
3187 | @@ -0,0 +1,12 @@ | |||
3188 | 1 | #!/bin/sh | ||
3189 | 2 | |||
3190 | 3 | set -e | ||
3191 | 4 | |||
3192 | 5 | . /usr/share/debconf/confmodule | ||
3193 | 6 | |||
3194 | 7 | #DEBHELPER# | ||
3195 | 8 | |||
3196 | 9 | invoke-rc.d apache2 stop || true | ||
3197 | 10 | |||
3198 | 11 | . /usr/share/dbconfig-common/dpkg/prerm.pgsql | ||
3199 | 12 | dbc_go maas-region-controller $@ | ||
3200 | 0 | 13 | ||
3201 | === added file 'debian/maintscript' | |||
3202 | --- debian/maintscript 1970-01-01 00:00:00 +0000 | |||
3203 | +++ debian/maintscript 2014-07-15 21:22:45 +0000 | |||
3204 | @@ -0,0 +1,2 @@ | |||
3205 | 1 | rm_conffile /etc/init/maas-celery.conf 0.1+bzr971+dfsg-0ubuntu2 | ||
3206 | 2 | rm_conffile /etc/dbconfig-common/maas.conf 0.1+bzr971+dfsg-0ubuntu2 | ||
3207 | 0 | 3 | ||
3208 | === added directory 'debian/patches' | |||
3209 | === added file 'debian/patches/01-fix-database-settings.patch' | |||
3210 | --- debian/patches/01-fix-database-settings.patch 1970-01-01 00:00:00 +0000 | |||
3211 | +++ debian/patches/01-fix-database-settings.patch 2014-07-15 21:22:45 +0000 | |||
3212 | @@ -0,0 +1,24 @@ | |||
3213 | 1 | --- maas-1.5+bzr1908.orig.orig/contrib/maas_local_settings.py 2014-02-07 11:22:59.330556956 -0500 | ||
3214 | 2 | +++ maas-1.5+bzr1908.orig/contrib/maas_local_settings.py 2014-02-07 11:22:59.326556956 -0500 | ||
3215 | 3 | @@ -7,7 +7,7 @@ | ||
3216 | 4 | DEFAULT_MAAS_URL = "http://maas.internal.example.com/" | ||
3217 | 5 | |||
3218 | 6 | # Absolute path to the directory static files should be collected to. | ||
3219 | 7 | -STATIC_ROOT = '/var/lib/maas/static/' | ||
3220 | 8 | +STATIC_ROOT = '/usr/share/maas/web/static/' | ||
3221 | 9 | |||
3222 | 10 | # Prefix to use for MAAS's urls. | ||
3223 | 11 | # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with | ||
3224 | 12 | @@ -81,9 +81,9 @@ | ||
3225 | 13 | 'default': { | ||
3226 | 14 | # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc. | ||
3227 | 15 | 'ENGINE': 'django.db.backends.postgresql_psycopg2', | ||
3228 | 16 | - 'NAME': '', | ||
3229 | 17 | - 'USER': '', | ||
3230 | 18 | - 'PASSWORD': '', | ||
3231 | 19 | + 'NAME': 'maasdb', | ||
3232 | 20 | + 'USER': 'maas', | ||
3233 | 21 | + 'PASSWORD': 'maas', | ||
3234 | 22 | 'HOST': 'localhost', | ||
3235 | 23 | } | ||
3236 | 24 | } | ||
3237 | 0 | 25 | ||
3238 | === added file 'debian/patches/02-pserv-config.patch' | |||
3239 | --- debian/patches/02-pserv-config.patch 1970-01-01 00:00:00 +0000 | |||
3240 | +++ debian/patches/02-pserv-config.patch 2014-07-15 21:22:45 +0000 | |||
3241 | @@ -0,0 +1,34 @@ | |||
3242 | 1 | Description: Use default settings for MAAS PSERV | ||
3243 | 2 | Use default settings for MAAS pserv. These default settings | ||
3244 | 3 | include port, logfile, oops directory, cobbler url and username | ||
3245 | 4 | Author: Andres Rodriguez <andreserl@ubuntu.com> | ||
3246 | 5 | |||
3247 | 6 | --- a/etc/maas/pserv.yaml | ||
3248 | 7 | +++ b/etc/maas/pserv.yaml | ||
3249 | 8 | @@ -6,7 +6,7 @@ | ||
3250 | 9 | ## running server. | ||
3251 | 10 | # | ||
3252 | 11 | # logfile: "pserv.log" | ||
3253 | 12 | -logfile: "/dev/null" | ||
3254 | 13 | +logfile: "/var/log/maas/pserv.log" | ||
3255 | 14 | |||
3256 | 15 | ## OOPS configuration (optional). | ||
3257 | 16 | # | ||
3258 | 17 | @@ -15,7 +15,7 @@ | ||
3259 | 18 | # or directories other than what the oops machinery creates there. | ||
3260 | 19 | # | ||
3261 | 20 | # directory: | ||
3262 | 21 | - directory: "logs/oops" | ||
3263 | 22 | + directory: "/var/log/maas/oops" | ||
3264 | 23 | # reporter: | ||
3265 | 24 | reporter: "maas-pserv" | ||
3266 | 25 | |||
3267 | 26 | @@ -38,8 +38,6 @@ | ||
3268 | 27 | # resource_root: /var/lib/maas/boot-resources/current/ | ||
3269 | 28 | |||
3270 | 29 | # port: 69 | ||
3271 | 30 | - port: 5244 | ||
3272 | 31 | ## The URL to be contacted to generate PXE configurations. | ||
3273 | 32 | # generator: http://localhost/MAAS/api/1.0/pxeconfig/ | ||
3274 | 33 | - generator: http://localhost:5243/api/1.0/pxeconfig/ | ||
3275 | 34 | |||
3276 | 0 | 35 | ||
3277 | === added file 'debian/patches/03-txlongpoll-config.patch' | |||
3278 | --- debian/patches/03-txlongpoll-config.patch 1970-01-01 00:00:00 +0000 | |||
3279 | +++ debian/patches/03-txlongpoll-config.patch 2014-07-15 21:22:45 +0000 | |||
3280 | @@ -0,0 +1,37 @@ | |||
3281 | 1 | Description: Use default settings for MAAS txlongpoll | ||
3282 | 2 | Use default settings for MAAS txlongpoll. These default settings | ||
3283 | 3 | include oops directory, Message broker configuration, logfile. | ||
3284 | 4 | Author: Andres Rodriguez <andreserl@ubuntu.com> | ||
3285 | 5 | |||
3286 | 6 | --- maas-1.5+bzr1908.orig.orig/etc/txlongpoll.yaml 2014-02-07 11:21:12.578557974 -0500 | ||
3287 | 7 | +++ maas-1.5+bzr1908.orig/etc/txlongpoll.yaml 2014-02-07 11:21:12.578557974 -0500 | ||
3288 | 8 | @@ -17,7 +17,7 @@ | ||
3289 | 9 | # or directories other than what the oops machinery creates there. | ||
3290 | 10 | # | ||
3291 | 11 | # directory: "" | ||
3292 | 12 | - directory: "logs/oops" | ||
3293 | 13 | + directory: "/var/log/maas/oops" | ||
3294 | 14 | ## The reporter used when generating OOPS reports. | ||
3295 | 15 | # reporter: "LONGPOLL" | ||
3296 | 16 | reporter: "maas-txlongpoll" | ||
3297 | 17 | @@ -25,14 +25,14 @@ | ||
3298 | 18 | ## Message broker configuration. | ||
3299 | 19 | # | ||
3300 | 20 | broker: | ||
3301 | 21 | - # host: "localhost" | ||
3302 | 22 | - # port: 5672 | ||
3303 | 23 | - # username: "guest" | ||
3304 | 24 | - # password: "guest" | ||
3305 | 25 | - # vhost: "/" | ||
3306 | 26 | + host: "localhost" | ||
3307 | 27 | + port: 5672 | ||
3308 | 28 | + username: "maas_longpoll" | ||
3309 | 29 | + password: "maaslongpoll" | ||
3310 | 30 | + vhost: "/maas_longpoll" | ||
3311 | 31 | |||
3312 | 32 | ## Where to log. This log can be rotated by sending SIGUSR1 to the | ||
3313 | 33 | ## running server. | ||
3314 | 34 | # | ||
3315 | 35 | # logfile: "txlongpoll.log" | ||
3316 | 36 | -logfile: "/dev/null" | ||
3317 | 37 | +logfile: "/var/log/maas/txlongpoll.log" | ||
3318 | 0 | 38 | ||
3319 | === added file 'debian/patches/series' | |||
3320 | --- debian/patches/series 1970-01-01 00:00:00 +0000 | |||
3321 | +++ debian/patches/series 2014-07-15 21:22:45 +0000 | |||
3322 | @@ -0,0 +1,3 @@ | |||
3323 | 1 | 01-fix-database-settings.patch | ||
3324 | 2 | 02-pserv-config.patch | ||
3325 | 3 | 03-txlongpoll-config.patch | ||
3326 | 0 | 4 | ||
3327 | === added directory 'debian/po' | |||
3328 | === added file 'debian/po/POTFILES.in' | |||
3329 | --- debian/po/POTFILES.in 1970-01-01 00:00:00 +0000 | |||
3330 | +++ debian/po/POTFILES.in 2014-07-15 21:22:45 +0000 | |||
3331 | @@ -0,0 +1,2 @@ | |||
3332 | 1 | [type: gettext/rfc822deb] maas-region-controller.templates | ||
3333 | 2 | [type: gettext/rfc822deb] maas-cluster-controller.templates | ||
3334 | 0 | 3 | ||
3335 | === added file 'debian/po/templates.pot' | |||
3336 | --- debian/po/templates.pot 1970-01-01 00:00:00 +0000 | |||
3337 | +++ debian/po/templates.pot 2014-07-15 21:22:45 +0000 | |||
3338 | @@ -0,0 +1,82 @@ | |||
3339 | 1 | # SOME DESCRIPTIVE TITLE. | ||
3340 | 2 | # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER | ||
3341 | 3 | # This file is distributed under the same license as the PACKAGE package. | ||
3342 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
3343 | 5 | # | ||
3344 | 6 | #, fuzzy | ||
3345 | 7 | msgid "" | ||
3346 | 8 | msgstr "" | ||
3347 | 9 | "Project-Id-Version: maas\n" | ||
3348 | 10 | "Report-Msgid-Bugs-To: maas@packages.debian.org\n" | ||
3349 | 11 | "POT-Creation-Date: 2012-10-04 13:40-0400\n" | ||
3350 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
3351 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
3352 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | ||
3353 | 15 | "Language: \n" | ||
3354 | 16 | "MIME-Version: 1.0\n" | ||
3355 | 17 | "Content-Type: text/plain; charset=CHARSET\n" | ||
3356 | 18 | "Content-Transfer-Encoding: 8bit\n" | ||
3357 | 19 | |||
3358 | 20 | #. Type: note | ||
3359 | 21 | #. Description | ||
3360 | 22 | #: ../maas-region-controller.templates:1001 | ||
3361 | 23 | msgid "Ubuntu MAAS Server" | ||
3362 | 24 | msgstr "" | ||
3363 | 25 | |||
3364 | 26 | #. Type: note | ||
3365 | 27 | #. Description | ||
3366 | 28 | #: ../maas-region-controller.templates:1001 | ||
3367 | 29 | msgid "" | ||
3368 | 30 | "The Ubuntu MAAS Server has been installed in your system. You can access the " | ||
3369 | 31 | "MAAS Web interface here:" | ||
3370 | 32 | msgstr "" | ||
3371 | 33 | |||
3372 | 34 | #. Type: note | ||
3373 | 35 | #. Description | ||
3374 | 36 | #: ../maas-region-controller.templates:1001 | ||
3375 | 37 | msgid " http://${MAAS_URL}/MAAS" | ||
3376 | 38 | msgstr "" | ||
3377 | 39 | |||
3378 | 40 | #. Type: note | ||
3379 | 41 | #. Description | ||
3380 | 42 | #: ../maas-region-controller.templates:1001 | ||
3381 | 43 | msgid "" | ||
3382 | 44 | "If the automatically detected address above is not in the same network as " | ||
3383 | 45 | "the MAAS clients, you need to reconfigure it:" | ||
3384 | 46 | msgstr "" | ||
3385 | 47 | |||
3386 | 48 | #. Type: note | ||
3387 | 49 | #. Description | ||
3388 | 50 | #: ../maas-region-controller.templates:1001 | ||
3389 | 51 | msgid " sudo dpkg-reconfigure maas-region-controller" | ||
3390 | 52 | msgstr "" | ||
3391 | 53 | |||
3392 | 54 | #. Type: string | ||
3393 | 55 | #. Description | ||
3394 | 56 | #: ../maas-region-controller.templates:2001 | ||
3395 | 57 | msgid "Ubuntu MAAS PXE/Provisioning network address:" | ||
3396 | 58 | msgstr "" | ||
3397 | 59 | |||
3398 | 60 | #. Type: string | ||
3399 | 61 | #. Description | ||
3400 | 62 | #: ../maas-region-controller.templates:2001 | ||
3401 | 63 | msgid "" | ||
3402 | 64 | "The Ubuntu MAAS Server automatically detects the IP address that is used for " | ||
3403 | 65 | "PXE and provisioning. However, it needs to be in the same network as the " | ||
3404 | 66 | "clients. If the automatically detected address is not in the same network as " | ||
3405 | 67 | "the clients, it must be changed." | ||
3406 | 68 | msgstr "" | ||
3407 | 69 | |||
3408 | 70 | #. Type: string | ||
3409 | 71 | #. Description | ||
3410 | 72 | #: ../maas-cluster-controller.templates:1001 | ||
3411 | 73 | msgid "Ubuntu MAAS API address:" | ||
3412 | 74 | msgstr "" | ||
3413 | 75 | |||
3414 | 76 | #. Type: string | ||
3415 | 77 | #. Description | ||
3416 | 78 | #: ../maas-cluster-controller.templates:1001 | ||
3417 | 79 | msgid "" | ||
3418 | 80 | "The MAAS Cluster Controller needs to contact the MAAS server to register its " | ||
3419 | 81 | "presence. Set the URL to the MAAS API here, e.g. http://192.168.1.1/MAAS" | ||
3420 | 82 | msgstr "" | ||
3421 | 0 | 83 | ||
3422 | === added file 'debian/python-django-maas.install' | |||
3423 | --- debian/python-django-maas.install 1970-01-01 00:00:00 +0000 | |||
3424 | +++ debian/python-django-maas.install 2014-07-15 21:22:45 +0000 | |||
3425 | @@ -0,0 +1,2 @@ | |||
3426 | 1 | debian/tmp/usr/lib/python*/dist-packages/maasserver | ||
3427 | 2 | debian/tmp/usr/lib/python*/dist-packages/metadataserver | ||
3428 | 0 | 3 | ||
3429 | === added file 'debian/python-maas-client.install' | |||
3430 | --- debian/python-maas-client.install 1970-01-01 00:00:00 +0000 | |||
3431 | +++ debian/python-maas-client.install 2014-07-15 21:22:45 +0000 | |||
3432 | @@ -0,0 +1,1 @@ | |||
3433 | 1 | debian/tmp/usr/lib/python*/dist-packages/apiclient | ||
3434 | 0 | 2 | ||
3435 | === added file 'debian/python-maas-provisioningserver.install' | |||
3436 | --- debian/python-maas-provisioningserver.install 1970-01-01 00:00:00 +0000 | |||
3437 | +++ debian/python-maas-provisioningserver.install 2014-07-15 21:22:45 +0000 | |||
3438 | @@ -0,0 +1,5 @@ | |||
3439 | 1 | debian/tmp/usr/lib/python*/dist-packages/provisioningserver | ||
3440 | 2 | |||
3441 | 3 | # Install other stuff | ||
3442 | 4 | debian/extras/maas-provision usr/sbin | ||
3443 | 5 | debian/extras/maas-probe-dhcp usr/sbin | ||
3444 | 0 | 6 | ||
3445 | === added file 'debian/python-maas-provisioningserver.lintian-overrides' | |||
3446 | --- debian/python-maas-provisioningserver.lintian-overrides 1970-01-01 00:00:00 +0000 | |||
3447 | +++ debian/python-maas-provisioningserver.lintian-overrides 2014-07-15 21:22:45 +0000 | |||
3448 | @@ -0,0 +1,2 @@ | |||
3449 | 1 | python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-provision | ||
3450 | 2 | python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-probe-dhcp | ||
3451 | 0 | 3 | ||
3452 | === added file 'debian/rules' | |||
3453 | --- debian/rules 1970-01-01 00:00:00 +0000 | |||
3454 | +++ debian/rules 2014-07-15 21:22:45 +0000 | |||
3455 | @@ -0,0 +1,56 @@ | |||
3456 | 1 | #!/usr/bin/make -f | ||
3457 | 2 | |||
3458 | 3 | BUILDHOME = $(CURDIR)/debian/build | ||
3459 | 4 | PYTHON = $(shell pyversions -d) | ||
3460 | 5 | # Python enum modules. | ||
3461 | 6 | py_enums := $(wildcard src/*/enum.py) | ||
3462 | 7 | |||
3463 | 8 | %: | ||
3464 | 9 | dh $@ --with python2,apport --buildsystem=python_distutils | ||
3465 | 10 | |||
3466 | 11 | override_dh_installinit: | ||
3467 | 12 | dh_installinit --name maas-txlongpoll --no-start | ||
3468 | 13 | dh_installinit --name maas-region-celery --no-start | ||
3469 | 14 | dh_installinit --name maas-pserv | ||
3470 | 15 | dh_installinit --name maas-cluster-celery | ||
3471 | 16 | dh_installinit --name maas-dhcp-server | ||
3472 | 17 | |||
3473 | 18 | override_dh_auto_build: | ||
3474 | 19 | dh_auto_build | ||
3475 | 20 | |||
3476 | 21 | mkdir -p $(BUILDHOME) | ||
3477 | 22 | HOME=$(BUILDHOME) PYTHONPATH=$(CURDIR)/src/ $(PYTHON) \ | ||
3478 | 23 | $(CURDIR)/src/maasserver/utils/jsenums.py \ | ||
3479 | 24 | $(py_enums) > $(BUILDHOME)/enums.js | ||
3480 | 25 | |||
3481 | 26 | override_dh_auto_install: | ||
3482 | 27 | dh_auto_install | ||
3483 | 28 | |||
3484 | 29 | # Move static files | ||
3485 | 30 | install -d -m 755 $(CURDIR)/debian/tmp/usr/share/maas/web/static | ||
3486 | 31 | mv $(CURDIR)/debian/tmp/usr/lib/python*/*-packages/maasserver/static \ | ||
3487 | 32 | $(CURDIR)/debian/tmp/usr/share/maas/web/ | ||
3488 | 33 | |||
3489 | 34 | # Install built enums.js file. | ||
3490 | 35 | cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/ | ||
3491 | 36 | |||
3492 | 37 | # install the apparmor profile | ||
3493 | 38 | install -d -m 755 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d | ||
3494 | 39 | install -m 644 $(CURDIR)/debian/maas-dhcp.apparmor \ | ||
3495 | 40 | $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d/maas | ||
3496 | 41 | |||
3497 | 42 | dh_install --list-missing | ||
3498 | 43 | |||
3499 | 44 | override_dh_auto_clean: | ||
3500 | 45 | dh_auto_clean | ||
3501 | 46 | rm -rf $(BUILDHOME) | ||
3502 | 47 | rm -rf src/*.egg-info | ||
3503 | 48 | |||
3504 | 49 | DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST))) | ||
3505 | 50 | REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \ | ||
3506 | 51 | | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p') | ||
3507 | 52 | VER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \ | ||
3508 | 53 | | sed -rne 's,^Version: ([^-]+).*,\1,p') | ||
3509 | 54 | get-orig-source: | ||
3510 | 55 | bzr export -r $(REV) --root=maas-$(VER).orig \ | ||
3511 | 56 | maas_$(VER).orig.tar.gz lp:maas/1.5 | ||
3512 | 0 | 57 | ||
3513 | === added directory 'debian/source' | |||
3514 | === added file 'debian/source/format' | |||
3515 | --- debian/source/format 1970-01-01 00:00:00 +0000 | |||
3516 | +++ debian/source/format 2014-07-15 21:22:45 +0000 | |||
3517 | @@ -0,0 +1,1 @@ | |||
3518 | 1 | 3.0 (quilt) | ||
3519 | 0 | 2 | ||
3520 | === added file 'debian/watch' | |||
3521 | --- debian/watch 1970-01-01 00:00:00 +0000 | |||
3522 | +++ debian/watch 2014-07-15 21:22:45 +0000 | |||
3523 | @@ -0,0 +1,3 @@ | |||
3524 | 1 | version=3 | ||
3525 | 2 | opts=dversionmangle=s/\.dfsg// \ | ||
3526 | 3 | http://launchpad.net/maas/+download https://launchpad.net/maas/.*/maas-(.*).tar.* |