Merge lp:~allenap/maas/packaging.remove-squashfs into lp:~maas-committers/maas/trunk
- packaging.remove-squashfs
- Merge into trunk
Status: | Superseded | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~allenap/maas/packaging.remove-squashfs | ||||||||||||
Merge into: | lp:~maas-committers/maas/trunk | ||||||||||||
Diff against target: |
2717 lines (+2387/-0) 65 files modified
debian/changelog (+629/-0) debian/compat (+1/-0) debian/control (+275/-0) debian/copyright (+25/-0) debian/extras/20-maas.conf (+32/-0) debian/extras/99-maas (+4/-0) debian/extras/99-maas-sudoers (+3/-0) debian/extras/isc-dhcp-server.override (+1/-0) debian/extras/maas (+8/-0) debian/extras/maas-cli (+2/-0) debian/extras/maas-provision (+7/-0) debian/extras/maas-region-celeryd (+50/-0) debian/extras/maas_remote_syslog_compress (+2/-0) debian/maas-cli.install (+2/-0) debian/maas-cluster-controller.config (+31/-0) debian/maas-cluster-controller.dirs (+1/-0) debian/maas-cluster-controller.install (+27/-0) debian/maas-cluster-controller.links (+1/-0) debian/maas-cluster-controller.logrotate (+9/-0) debian/maas-cluster-controller.maas-cluster-celery.upstart (+26/-0) debian/maas-cluster-controller.maas-pserv.upstart (+14/-0) debian/maas-cluster-controller.postinst (+62/-0) debian/maas-cluster-controller.postrm (+30/-0) debian/maas-cluster-controller.prerm (+10/-0) debian/maas-cluster-controller.templates (+7/-0) debian/maas-common.install (+2/-0) debian/maas-common.postinst (+22/-0) debian/maas-common.postrm (+13/-0) debian/maas-dhcp.apparmor (+7/-0) debian/maas-dhcp.install (+1/-0) debian/maas-dhcp.maas-dhcp-server.upstart (+60/-0) debian/maas-dhcp.postinst (+22/-0) debian/maas-dhcp.postrm (+11/-0) debian/maas-dns.dirs (+1/-0) debian/maas-dns.postinst (+35/-0) debian/maas-dns.postrm (+24/-0) debian/maas-region-controller.apport (+37/-0) debian/maas-region-controller.config (+45/-0) debian/maas-region-controller.dirs (+2/-0) debian/maas-region-controller.install (+33/-0) debian/maas-region-controller.links (+2/-0) debian/maas-region-controller.lintian-overrides (+7/-0) debian/maas-region-controller.logrotate (+18/-0) debian/maas-region-controller.maas-region-celery.upstart (+26/-0) debian/maas-region-controller.maas-txlongpoll.upstart (+27/-0) debian/maas-region-controller.postinst (+295/-0) debian/maas-region-controller.postrm (+52/-0) debian/maas-region-controller.prerm (+18/-0) debian/maas-region-controller.templates (+22/-0) debian/maintscript (+2/-0) debian/patches/01-fix-database-settings.patch (+26/-0) debian/patches/02-pserv-config.patch (+38/-0) debian/patches/03-txlongpoll-config.patch (+39/-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 (+4/-0) debian/rules (+65/-0) debian/source/format (+1/-0) debian/tests/control (+2/-0) debian/tests/maas-integration.py (+72/-0) debian/tests/maas-package-test (+5/-0) debian/watch (+2/-0) |
||||||||||||
To merge this branch: | bzr merge lp:~allenap/maas/packaging.remove-squashfs | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Launchpad code reviewers | Pending | ||
Review via email: mp+134085@code.launchpad.net |
Commit message
Remove all install-
Description of the change
Counterpart to lp:~allenap/maas/remove-squashfs.
Unmerged revisions
- 145. By Gavin Panella
-
Remove all reference to squashfs installs.
- 144. By Jeroen T. Vermeulen
-
[r=andreserl]
[bug=][ author= jtv] Move the import scripts from the region-controller package to the cluster-controller package. - 143. By Raphaël Badin
-
[r=jtv]
[bug=][ author= rvb] Add sudo rule so that the script maas-import- pxe-files can be called by the user 'maas'. - 142. By Raphaël Badin
-
[r=andreserl][bug=1072744][author=rvb] * debian/control: Remove the dependency of maas-cluster-
controller on rabbitmq-server. - 141. By Julian Edwards
-
[r=julian-edwards][bug=1052805][author=
julian- edwards] [ Julian Edwards ]
* debian/maas-region- controller. install: Remove installation of maas-gc; it
is no longer required as upstream no longer stores files in the filesystem.
(LP: #1069734) - 140. By Raphaël Badin
-
[r=julian-edwards][bug=1066935][author=rvb] Fix permissions and group ownership of file /etc/bind/
maas/named. conf.rndc. maas. - 139. By Andres Rodriguez
-
[r=julian-edwards][bug=1064638,1064672,
1066938, 1066958, 1067261, 1067929] [author= andreserl] 0.1+bzr1269+ dfsg-0ubuntu1
0.1+bzr1269+dfsg-0ubuntu2 - 138. By Gavin Panella
-
[r=andreserl,rvb][bug=1066929][author=allenap] Missing changelog entry for "Remove MAAS-related include lines from named's config before adding new".
- 137. By Andres Rodriguez
-
[r=andreserl]
[bug=][ author= andreserl] Releasing 0.1+bzr1264+ dfsg-0ubuntu2
Opening 0.1+bzr1264+dfsg-0ubuntu3 - 136. By Gavin Panella
-
[r=rvb][bug=1066929][author=allenap] Remove MAAS-related include lines from named's config before adding new.
Preview Diff
1 | === added directory 'debian' | |||
2 | === added file 'debian/changelog' | |||
3 | --- debian/changelog 1970-01-01 00:00:00 +0000 | |||
4 | +++ debian/changelog 2012-11-13 12:12:21 +0000 | |||
5 | @@ -0,0 +1,629 @@ | |||
6 | 1 | maas (0.1+bzr1269+dfsg-0ubuntu2) UNRELEASED; urgency=low | ||
7 | 2 | |||
8 | 3 | [ Raphaël Badin ] | ||
9 | 4 | * debian/maas-dns.postinst: fix permissions and group ownership of | ||
10 | 5 | file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935) | ||
11 | 6 | * debian/control: Remove the dependency of maas-cluster-controller | ||
12 | 7 | on rabbitmq-server. (LP: #1072744) | ||
13 | 8 | * debian/extras/99-maas-sudoers: Add sudo rule for script | ||
14 | 9 | /usr/sbin/maas-import-pxe-files. | ||
15 | 10 | |||
16 | 11 | [ Julian Edwards ] | ||
17 | 12 | * debian/maas-region-controller.install: Remove installation of maas-gc; it | ||
18 | 13 | is no longer required as upstream no longer stores files in the filesystem. | ||
19 | 14 | (LP: #1069734) | ||
20 | 15 | |||
21 | 16 | [ Jeroen Vermeulen ] | ||
22 | 17 | * debian/maas-cluster-controller.install: Install import scripts. | ||
23 | 18 | * debian/maas-cluster-controller.postinst: Configure tgt (the iSCSI server) | ||
24 | 19 | so the import script can install files to it. | ||
25 | 20 | * debian/maas-cluster-controller.postrm: Clean up tgt config. | ||
26 | 21 | * debian/maas-region-controller.install: Move import scripts out to the | ||
27 | 22 | cluster controller, and drop the maas-import-isos compatibility script. | ||
28 | 23 | * debian/maas-region-controller.postinst: Remove tgt config. | ||
29 | 24 | * debian/maas-region-controller.postrm: Remove tgt config cleanup. | ||
30 | 25 | |||
31 | 26 | [ Gavin Panella ] | ||
32 | 27 | * debian/extras/99-maas: squashfs image download is no longer needed. | ||
33 | 28 | * debian/maas-cluster-controller.install: maas-import-squashfs and its | ||
34 | 29 | configuration file are no longer part of upstream. | ||
35 | 30 | |||
36 | 31 | -- Julian Edwards <julian.edwards@canonical.com> Fri, 26 Oct 2012 12:50:20 +0200 | ||
37 | 32 | |||
38 | 33 | maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low | ||
39 | 34 | |||
40 | 35 | * New upstream bugfix release | ||
41 | 36 | - Fixes commissioning failing to set memory attribute. (LP: #1064638) | ||
42 | 37 | - Fixes node listing by adding pagination (LP: #1064672) | ||
43 | 38 | - Changes default bind rndc key which breaks initscripts (LP: #1066938) | ||
44 | 39 | - Fixes invalid DNS config once node is enlisted (LP: #1066958) | ||
45 | 40 | - Reference documentation link to correct URL (LP: #1067261) | ||
46 | 41 | |||
47 | 42 | [ Andres Rodriguez ] | ||
48 | 43 | * debian/rules: Change upstream branch. | ||
49 | 44 | |||
50 | 45 | [ Gavin Panella ] | ||
51 | 46 | * debian/maas-dns.postinst: Remove MAAS-related include lines from named's | ||
52 | 47 | config before adding a new one (LP: #1066929) | ||
53 | 48 | |||
54 | 49 | [ Raphael Badin ] | ||
55 | 50 | * debian/extras/maas-region-celeryd: Remove whitespace that affects DNS | ||
56 | 51 | rabbitmq queue. (LP: #1067929) | ||
57 | 52 | |||
58 | 53 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 16 Oct 2012 10:31:37 -0400 | ||
59 | 54 | |||
60 | 55 | maas (0.1+bzr1264+dfsg-0ubuntu2) quantal; urgency=low | ||
61 | 56 | |||
62 | 57 | * Fix MAAS not working after CD/preseed install (LP: #1065763) | ||
63 | 58 | - debian/extras/maas-region-celeryd: Add wrapper to run celery from | ||
64 | 59 | the upstart job. | ||
65 | 60 | - debian/extras/maas-region-controller.maas-region-celery.upstart: Create | ||
66 | 61 | rabbitmq user if it does not exists. | ||
67 | 62 | * debian/control: Remove unneeded deps on python-txtftp for some binary pkgs. | ||
68 | 63 | * debian/maas-region-controller.postinst: Minor fix referencing variable. | ||
69 | 64 | |||
70 | 65 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 11 Oct 2012 17:38:08 -0400 | ||
71 | 66 | |||
72 | 67 | maas (0.1+bzr1264+dfsg-0ubuntu1) quantal; urgency=low | ||
73 | 68 | |||
74 | 69 | * New upstream release. | ||
75 | 70 | |||
76 | 71 | [ Raphaël Badin ] | ||
77 | 72 | * debian/maas-region-controller.postinst: Enable proxy_http module. | ||
78 | 73 | * debian/maas-cluster-controller.postinst: Create /var/lib/maas. (LP: #1065062) | ||
79 | 74 | |||
80 | 75 | [ Andres Rodriguez ] | ||
81 | 76 | * Install maas-provision with python-maas-provisioningserver (LP: #1065171): | ||
82 | 77 | - debian/python-maas-provisioningserver.install: Install | ||
83 | 78 | - debian/control: Add Conflicts/Replaces with maas-cluster-controller | ||
84 | 79 | to handle upgrades. | ||
85 | 80 | * debian/patches/04-fix-ipmi-enlistment.patch: Drop. Merged Upstream. | ||
86 | 81 | * debian/control: Depends on maas-region-controller for maas-dns. | ||
87 | 82 | * debian/maas-region-controller.postinst: Set the correct host for | ||
88 | 83 | BROKER_URL (LP: #1065080) | ||
89 | 84 | * Handle creation of user/group in maas-common. | ||
90 | 85 | * debian/maas-region-controller.config: Always source dbconfig scripts. | ||
91 | 86 | |||
92 | 87 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Oct 2012 11:17:21 -0400 | ||
93 | 88 | |||
94 | 89 | maas (0.1+bzr1243+dfsg-0ubuntu3) quantal; urgency=low | ||
95 | 90 | |||
96 | 91 | * 04-fix-ipmi-enlistment.patch: retry maas-enlist without power parameters | ||
97 | 92 | on failure. This allows enlistment to continue working with Precise | ||
98 | 93 | ephemeral images before the Precise SRU for maas-enlist lands. | ||
99 | 94 | (LP: #1064922). | ||
100 | 95 | |||
101 | 96 | -- Robie Basak <robie.basak@canonical.com> Wed, 10 Oct 2012 13:29:16 +0000 | ||
102 | 97 | |||
103 | 98 | maas (0.1+bzr1243+dfsg-0ubuntu2) quantal; urgency=low | ||
104 | 99 | |||
105 | 100 | * debian/patches/99-ipmi-user-too-long.patch: Fix username too long for | ||
106 | 101 | IPMI user created on enlistment (LP: #1064832) | ||
107 | 102 | |||
108 | 103 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 10 Oct 2012 01:00:29 -0400 | ||
109 | 104 | |||
110 | 105 | maas (0.1+bzr1243+dfsg-0ubuntu1) quantal; urgency=low | ||
111 | 106 | |||
112 | 107 | * New upstream release. (LP: #1064596) | ||
113 | 108 | * debian/patches/99-temporary-fix-constraints.patch: Dropped. | ||
114 | 109 | * debian/control: | ||
115 | 110 | - ${python:Depends} for maas-common. | ||
116 | 111 | - Add missing Depends for python-maas-provisioningserver (LP: #1064542) | ||
117 | 112 | * debian/maas-cluster-controller.postinst: Create /var/log/maas if it | ||
118 | 113 | doesn't exist (LP: #1064539) | ||
119 | 114 | |||
120 | 115 | -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 08 Oct 2012 17:02:56 -0400 | ||
121 | 116 | |||
122 | 117 | maas (0.1+bzr1223+dfsg-0ubuntu1) quantal; urgency=low | ||
123 | 118 | |||
124 | 119 | * New upstream release. (LP: #1062518) | ||
125 | 120 | |||
126 | 121 | [ Julian Edwards ] | ||
127 | 122 | * Split packaging of 'maas' into maas-{region,cluster}-controller | ||
128 | 123 | - debian/control: Update accordingly. | ||
129 | 124 | - debian/*.install: Move files accordingly | ||
130 | 125 | - debian/*.{postinst,postrm,preinst}: Move files accordingly. | ||
131 | 126 | * Ensure isc-dhcp-server is disabled when installing maas-dhcp. | ||
132 | 127 | * Ensure maas-dns creates the maas user before trying to chown files. | ||
133 | 128 | * Make maas-cluster-controller autoconfigure itself when upgrading from the | ||
134 | 129 | old maas package. (LP: #1059416) | ||
135 | 130 | * Add missing prerm file for maas-cluster-controller so that .pyc files | ||
136 | 131 | are cleaned up. (LP: #1059973) | ||
137 | 132 | |||
138 | 133 | [ Raphaël Badin ] | ||
139 | 134 | * Install maas_local_celeryconfig.py in /etc/maas and symlink to | ||
140 | 135 | /usr/share/maas. | ||
141 | 136 | * debian/maas.postinst: Create rabbitmq celery user/vhost. | ||
142 | 137 | * debian/maas.postinst: Update BROKER_URL in maas_local_celeryconfig.py. | ||
143 | 138 | * Use maas_local_celeryconfig_cluster.py as the local celery | ||
144 | 139 | configuration file for the cluster worker. | ||
145 | 140 | * debian/maas-region-controller.maas-region-celery.upstart: Add region | ||
146 | 141 | worker upstart script. | ||
147 | 142 | * Rename cluster worker upstart script into | ||
148 | 143 | maas-cluster-controller.maas-clluster-celery.upstart. | ||
149 | 144 | * maas-cluster-controller.maas-celery.upstart: use "celeryconfig_cluster" | ||
150 | 145 | as the Celery config module. | ||
151 | 146 | * debian/maas-common.install: Install celeryconfig_common.py. | ||
152 | 147 | * debian/maas-cluster-controller.install: Install celeryconfig_cluster.py. | ||
153 | 148 | * debian/maas-region-controller.install: Install celeryconfig.py. | ||
154 | 149 | * Split celery config into cluster and region configs. | ||
155 | 150 | * Add region celeryd upstart config. | ||
156 | 151 | * Define CELERY_CONFIG_MODULE in | ||
157 | 152 | maas-cluster-controller.maas-cluster-celery.upstart | ||
158 | 153 | |||
159 | 154 | [ Jeroen Vermeulen ] | ||
160 | 155 | * Make maas_local_celery_config.py non-world readable. | ||
161 | 156 | * Make maas_local_celeryconfig_cluster.py non-world readable. | ||
162 | 157 | * Set root:maas ownership of local cluster config only *after* | ||
163 | 158 | the maas user/group have been created | ||
164 | 159 | |||
165 | 160 | [ Andres Rodriguez ] | ||
166 | 161 | * debian/maas.postinst: | ||
167 | 162 | - Always restart apache2. | ||
168 | 163 | - Handle upgrades for new upstream release. | ||
169 | 164 | - Handle upgrades for celery rabbitmq worker. | ||
170 | 165 | * Add binary package to install client tool. | ||
171 | 166 | - debian/extras/maas-cli: Add binary. | ||
172 | 167 | - debian/maas-cli.install: Add. Install maascli and apiclient. | ||
173 | 168 | - debian/control: Add binary package. | ||
174 | 169 | * debian/control: | ||
175 | 170 | - Depends on freeipmi-tools instead of ipmitool. | ||
176 | 171 | - Conflicts/Replaces on maas for python-maas-client. | ||
177 | 172 | - Depends on python-netifaces, python-lxml. | ||
178 | 173 | * Add python-maas-client binary package: | ||
179 | 174 | - debian/python-maas-client.install: Add. Install 'apiclient' python module. | ||
180 | 175 | - debian/control: Add package. python-django-maas and maas-cli now | ||
181 | 176 | Depend on it. | ||
182 | 177 | * debian/rules: Install maas-dhcp-server upstart job. | ||
183 | 178 | * debian/maas.postrm: Remove celery worker rabbitmq user and host. | ||
184 | 179 | * debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job | ||
185 | 180 | instead of isc-dhcp-server (LP: #1055951) | ||
186 | 181 | * debian/maas-region-controller.postinst: Cleanup upgrade rules. | ||
187 | 182 | * debian/maas-cluster-controller.postinst: Fix 'local' usage. | ||
188 | 183 | * debian/maas-common.install: Install celeryconfig in appropriate location. | ||
189 | 184 | * debian/maas-cluster-controller.postrm: Add and delete maas user. | ||
190 | 185 | * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server. | ||
191 | 186 | * debian/maas-region-controller.postinst: | ||
192 | 187 | - Always update passwords on upgrade. No longer check versioning. (LP: #1060094). | ||
193 | 188 | - Add MAAS server to allowed mirror in squid-deb-proxy | ||
194 | 189 | - Source dbconfig conf file for maas-region-controller on upgrade because | ||
195 | 190 | it writes a new config file and no longer preservers the previous password. | ||
196 | 191 | * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}. | ||
197 | 192 | * debian/maas-region-controller.install: Install maas-import-squashfs | ||
198 | 193 | * Handle removal of non existant files (LP: #1059556): | ||
199 | 194 | - debian/maintscript: Added to handle removal of conffiles. | ||
200 | 195 | - debian/control: Add Pre-depends and bump debhelper version. | ||
201 | 196 | * update po files for the templates. | ||
202 | 197 | * debian/extras/99-maas: Install in usr/share/maas/conf and symlink to the | ||
203 | 198 | appropriate etc dir. | ||
204 | 199 | * debian/maas-cluster-controller.config: Source debconf at the beginning of the | ||
205 | 200 | script. (LP: #1063857) | ||
206 | 201 | * debian/patches/99-temporary-fix-constraints.patch: Fix constraints maaping | ||
207 | 202 | when deploying with juju. Temporary until it gets merged upstream | ||
208 | 203 | |||
209 | 204 | [ Robie Basak ] | ||
210 | 205 | * Add maas-cluster-controller dependency on uuid-runtime, needed for uuidgen | ||
211 | 206 | by postinst. | ||
212 | 207 | |||
213 | 208 | [ Scott Moser ] | ||
214 | 209 | * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into | ||
215 | 210 | /etc/apparmor.d/dhcpd.d (LP: #1049177), and update apparmor profile for | ||
216 | 211 | /usr/sbin/dhcpd on install/remove | ||
217 | 212 | * get the ip address for the dhcp server in config | ||
218 | 213 | |||
219 | 214 | [ Diogo Matsubara ] | ||
220 | 215 | * Add initial tests to be run by autotests: | ||
221 | 216 | - debian/control: XS-Testsuite: autopkgtest | ||
222 | 217 | - debian/tests/control: Add | ||
223 | 218 | - debian/tests/maas-package-test: Add | ||
224 | 219 | - tests/maas-integration.py: Add | ||
225 | 220 | |||
226 | 221 | -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 08 Oct 2012 13:10:23 -0400 | ||
227 | 222 | |||
228 | 223 | maas (0.1+bzr971+dfsg-0ubuntu2) quantal; urgency=low | ||
229 | 224 | |||
230 | 225 | * debian/extras/99-maas-sudoers: Add missing rule for | ||
231 | 226 | maas-provision. (LP: #1046397) | ||
232 | 227 | |||
233 | 228 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 05 Sep 2012 12:36:58 -0400 | ||
234 | 229 | |||
235 | 230 | maas (0.1+bzr971+dfsg-0ubuntu1) quantal; urgency=low | ||
236 | 231 | |||
237 | 232 | * New upstream release (LP: #1044367) | ||
238 | 233 | |||
239 | 234 | [ Julian Edwards ] | ||
240 | 235 | * Fix 02-pserv-config.patch to handle new default tftp directory | ||
241 | 236 | |||
242 | 237 | [ Andres Rodriguez ] | ||
243 | 238 | * debian/maas.postinst: | ||
244 | 239 | - include '/MAAS' for DEFAULT_MAAS_URL.(LP: #1033956) | ||
245 | 240 | - Update bzr version to safely upgrade. | ||
246 | 241 | * Add maas-dns package that configures DNS in MAAS (LP: #1030860) | ||
247 | 242 | * Remove cobbler related bits | ||
248 | 243 | - debian/maas.postinst: Drop cobbler configuration | ||
249 | 244 | - debian/maas.install: Drop installation of snippets/preseeds. | ||
250 | 245 | - debian/control: | ||
251 | 246 | + Drop Depends on maas-provision. (LP: #975473) | ||
252 | 247 | + Depends on bind9utils. | ||
253 | 248 | + Depends on python-lockfile (LP: #1037400) | ||
254 | 249 | Add necessary Conflicts/Replaces. Add conflicts to tftpd-hpa and dnsmasq. | ||
255 | 250 | Depends on isc-dhcp-server for maas-dhcp, and syslinux-common. | ||
256 | 251 | - debian/extras/maas-provision: Add missing "$@" (LP: #1040462) | ||
257 | 252 | - debian/patches: | ||
258 | 253 | + 02-pserv-config.patch: Updated. Do not patch cobbler related bits. | ||
259 | 254 | patch tftp config to default. | ||
260 | 255 | * maas-dhcp: Re-add to handle initial configuration of MAAS DHCP server. | ||
261 | 256 | * Allow restart of 'isc-dhcp-server' by adding a sudoers file: | ||
262 | 257 | - debian/extras/99-maas-sudoers: Added. | ||
263 | 258 | - debian/maas.install: Install 99-maas-sudoers | ||
264 | 259 | * Minor improvements on dbconfig-common handling: | ||
265 | 260 | - debian/maas.config: Only call dbc_go when scripts present. | ||
266 | 261 | - debian/maas.postrm: Only call dbc_go when config file exists. | ||
267 | 262 | * debian/maas.maas-celery.upstart: Enable Beat and set scheduler db file. | ||
268 | 263 | * debian/maas-dns.postinst: Set correct permissions. (LP: #1042868) | ||
269 | 264 | * debian/maas-dhcp.config: | ||
270 | 265 | - Ask whether we want to enable DHCP (LP: #1044229) | ||
271 | 266 | - Add debconf question for network interfaces | ||
272 | 267 | * debian/maas.prerm: Stop services before removing database (LP: #1044559) | ||
273 | 268 | |||
274 | 269 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 02 Aug 2012 09:01:43 -0400 | ||
275 | 270 | |||
276 | 271 | maas (0.1+bzr777+dfsg-0ubuntu1) quantal-proposed; urgency=low | ||
277 | 272 | |||
278 | 273 | * New upstream release | ||
279 | 274 | * Only run 'maas' command as root. (LP: #974046) | ||
280 | 275 | - debian/extras/maas: Check id. | ||
281 | 276 | - debian/maas.install: Install in 'sbin'. | ||
282 | 277 | * debian/maas.postinst: | ||
283 | 278 | - restart apache2 after everything gets processed. | ||
284 | 279 | - Update version to handle upgrades. | ||
285 | 280 | * debian/extras/maas-provision: Add wrapper to access 'maasprovisiong' | ||
286 | 281 | command line. | ||
287 | 282 | * debian/patches/99_temporary_fix_path.patch: Dropped. No longer needed. | ||
288 | 283 | |||
289 | 284 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Jul 2012 08:28:36 -0400 | ||
290 | 285 | |||
291 | 286 | maas (0.1+bzr745+dfsg-0ubuntu2) quantal; urgency=low | ||
292 | 287 | |||
293 | 288 | * debian/control: Build-Dep on python-django instead of | ||
294 | 289 | python-django-configglue | ||
295 | 290 | |||
296 | 291 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Jul 2012 08:24:25 -0400 | ||
297 | 292 | |||
298 | 293 | maas (0.1+bzr745+dfsg-0ubuntu1) quantal; urgency=low | ||
299 | 294 | |||
300 | 295 | * New Upstream Release | ||
301 | 296 | * debian/patches: | ||
302 | 297 | - 99_power_fixes.patch: Dropped. Merged Upstream. | ||
303 | 298 | - 99_enums_js.patch: Dropped. No longer needed. | ||
304 | 299 | * Automatically build enums.js: | ||
305 | 300 | - debian/control: Build-Depends on python-django-configglue | ||
306 | 301 | - debian/rules: Build and install enums.js. | ||
307 | 302 | * debian/maas.postinst: Update version to handle upgrades | ||
308 | 303 | |||
309 | 304 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 12 Jul 2012 16:34:11 -0400 | ||
310 | 305 | |||
311 | 306 | maas (0.1+bzr740+dfsg-0ubuntu1) quantal; urgency=low | ||
312 | 307 | |||
313 | 308 | * New upstream release | ||
314 | 309 | * debian/control: Depends on python-txtftp. | ||
315 | 310 | * debian/rules: Do not ship python-tx-tftp. | ||
316 | 311 | * debian/maas.postinst: Update version to upgrade successfully. | ||
317 | 312 | * debian/patches: | ||
318 | 313 | - 02-pserv-config.patch: Refreshed. | ||
319 | 314 | - 99_enums_js.patch: Updated. | ||
320 | 315 | - 99_power_fixes.patch: Added temporarily to enable IPMI | ||
321 | 316 | - 99_temporary_fix_path.patch: Added temporarily to not fail when | ||
322 | 317 | importing celeryconfig | ||
323 | 318 | |||
324 | 319 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Jul 2012 17:54:49 -0400 | ||
325 | 320 | |||
326 | 321 | maas (0.1+bzr709+dfsg-0ubuntu1) quantal; urgency=low | ||
327 | 322 | |||
328 | 323 | * New Upstream release | ||
329 | 324 | * debian/control: | ||
330 | 325 | - Depends on python-celery, python-tempita, libjs-yui3-{full,min}, | ||
331 | 326 | libjs-raphael | ||
332 | 327 | * debian/maas.install: | ||
333 | 328 | - Install apiclient, celeryconfig.py, maas-import-pxe-files, preseeds_v2. | ||
334 | 329 | - Update to install various files from chroot, rather tha manually copy | ||
335 | 330 | them from the source. | ||
336 | 331 | * debian/maas.links: symlink celeryconfig.py | ||
337 | 332 | * debian/maas.maas-celery.upstart: Add job. | ||
338 | 333 | * debian/rules: | ||
339 | 334 | - Install celery upstart job. | ||
340 | 335 | - Do not install jslibs as packages are now used. | ||
341 | 336 | - Drop copying of maas_local_settings_sample.py as source now ships | ||
342 | 337 | a maas_local_settings.py | ||
343 | 338 | * debian/patches: | ||
344 | 339 | - 04-maas-http-fix.patch: Drop. Merged upstream. | ||
345 | 340 | - 01-fix-database-settings.patch: Refreshed. | ||
346 | 341 | - 99_enums_js.patch: Added until creation of enum.js / build process | ||
347 | 342 | is fixed. | ||
348 | 343 | * debian/maas.postinst: Update bzr version to correctly handle upgrades. | ||
349 | 344 | |||
350 | 345 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Jul 2012 17:42:37 -0400 | ||
351 | 346 | |||
352 | 347 | maas (0.1+bzr482+dfsg-0ubuntu1) precise; urgency=low | ||
353 | 348 | |||
354 | 349 | * New upstream release (Fixes LP: #981103) | ||
355 | 350 | * debian/maas.postinst: | ||
356 | 351 | - Make sure rabbitmq and postgresql are started on upgrade (LP: #981282) | ||
357 | 352 | - Handle upgrades from any lower than 0.1+bzr462+dfsg-0ubuntu1 to | ||
358 | 353 | correctly re-generate passwords, and not have db sync/migrate issues | ||
359 | 354 | as config has changed upstream. | ||
360 | 355 | - Correctly set Passwords for PSERV, otherwise it won't set new passwords. | ||
361 | 356 | * Allow MAAS_DEFAULT_URL reconfiguration. (LP: #980970) | ||
362 | 357 | - debian/maas.config: Add reconfigure validation to correctly allow it, | ||
363 | 358 | and ask a question. | ||
364 | 359 | - debian/maas.postinst: Reconfigure DEFAULT_MAAS_URL as well as cobbler | ||
365 | 360 | server and next_server for PXE/Provisioning. | ||
366 | 361 | - debian/maas.templates: Add debconf question and update info. | ||
367 | 362 | * Do not lose MAAS_DEFAULT_URL settings on upgrade (LP: #984309) | ||
368 | 363 | * debian/maas.postinst: | ||
369 | 364 | - Set cobbler password in between quotes (LP: #984427) | ||
370 | 365 | - Do not change permissions to maas.log (LP: #980915) | ||
371 | 366 | * no longer use maas-cloudimg2ephemeral, but rather use premade images | ||
372 | 367 | at http://maas.ubuntu.com | ||
373 | 368 | |||
374 | 369 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 17 Apr 2012 23:44:46 -0700 | ||
375 | 370 | |||
376 | 371 | maas (0.1+bzr462+dfsg-0ubuntu1) precise; urgency=low | ||
377 | 372 | |||
378 | 373 | * New upstream release (LP: #980240) | ||
379 | 374 | |||
380 | 375 | [ Scott Moser ] | ||
381 | 376 | * add dependency on distro-info (LP: #949442) | ||
382 | 377 | * debian/control: add dependency on tgt for ephemeral iscsi environment | ||
383 | 378 | |||
384 | 379 | [ Andres Rodriguez ] | ||
385 | 380 | * Make package lintian clean: | ||
386 | 381 | - maas{-dhcp}.lintian-overrides: Add to make lintian clean. | ||
387 | 382 | - debian/control: Add missing dependencies; correct section and desc. | ||
388 | 383 | - debian/maas.postinst: Do not use absolute path for rabbitmqctl. | ||
389 | 384 | - debian/patches: Add headers to all patches. | ||
390 | 385 | * debian/maas-dhcp.postrm: Added to disable dnsmasq in cobbler on removal. | ||
391 | 386 | * debian/maas.config: Do not set a password with pwgen as it is not an | ||
392 | 387 | essential package; allow dbconfig-common to create a password instead by | ||
393 | 388 | creating an empty question. (LP: #977475) | ||
394 | 389 | * Run MAAS, pserv, txlongpoll as non-root user. (LP: #975436) | ||
395 | 390 | - debian/maas.postinst: Create user/group; set correct permissions for | ||
396 | 391 | directories. | ||
397 | 392 | - debian/maas.postrm: Remove user/group; restart apache2. | ||
398 | 393 | - debian/maas.maas-{pserv,txlongpoll}.upstart: Update to run as non-root | ||
399 | 394 | 'maas' user. | ||
400 | 395 | * debian/patches/01-fix-database-settings.patch: Remove adding of PSERV_URL. | ||
401 | 396 | * debian/maas.postinst: | ||
402 | 397 | - Handle config file upgrade from versions lower than 0.1+bzr445+dfsg-0ubuntu1, | ||
403 | 398 | by creating new passwords and updating accordingly | ||
404 | 399 | - use local variables in functions. | ||
405 | 400 | - Handle maas tgt configuration for upgrades from 0.1+bzr459+dfsg-0ubuntu1. | ||
406 | 401 | * debian/extras/99-maas: Add squid-deb-proxy file to enable PPAs. (LP: #979383) | ||
407 | 402 | * debian/maas.install: Install missing commissioning-user-data script. | ||
408 | 403 | |||
409 | 404 | [ Dave Walker (Daviey) ] | ||
410 | 405 | * debian/patches/02-pserv-config.patch: Refreshed to apply to updated config. | ||
411 | 406 | |||
412 | 407 | [ Gavin Panella ] | ||
413 | 408 | * debian/maas.postinst: Update pserv.yaml and maas_local_settings.py to use | ||
414 | 409 | password. | ||
415 | 410 | |||
416 | 411 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 12 Apr 2012 16:37:53 -0400 | ||
417 | 412 | |||
418 | 413 | maas (0.1+bzr415+dfsg-0ubuntu2) precise; urgency=low | ||
419 | 414 | |||
420 | 415 | * debian/maas-dhcp.{config,postinst}: | ||
421 | 416 | - Fix not setting new values on fresh install. (LP: #975321) | ||
422 | 417 | - Fix unsetting domain, otherwise, even if disabled, it will always be set. | ||
423 | 418 | * debian/control: Depends on maas for maas-dhcp. | ||
424 | 419 | |||
425 | 420 | -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 06 Apr 2012 15:30:44 -0400 | ||
426 | 421 | |||
427 | 422 | maas (0.1+bzr415+dfsg-0ubuntu1) precise; urgency=low | ||
428 | 423 | |||
429 | 424 | * debian/control: Update package descriptions; Suggests maas-dhcp for maas | ||
430 | 425 | and add a maas-dhcp binary. | ||
431 | 426 | * Add maas-dhcp package to configure a DHCP server. | ||
432 | 427 | - debian/maas-dhcp.config: Add to ask debconf questions about range, | ||
433 | 428 | gateway, and domain. | ||
434 | 429 | - debian/maas-dhcp.postinst: Handle update of config values. | ||
435 | 430 | - debian/maas-dhcp.templates: Debconf questions. | ||
436 | 431 | * debian/po: Update for templates. | ||
437 | 432 | * Add message telling MAAS URL after installation. | ||
438 | 433 | - debian/maas.templates: Add message. | ||
439 | 434 | - debian/maas.postinst: Display message. | ||
440 | 435 | * debian/maas.config: Hide dbconfig-install question. | ||
441 | 436 | |||
442 | 437 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 04 Apr 2012 14:47:13 -0400 | ||
443 | 438 | |||
444 | 439 | maas (0.1+bzr400+dfsg-0ubuntu1) precise; urgency=low | ||
445 | 440 | |||
446 | 441 | * debian/patches/{02-pserv-config,03-txlongpoll-config}.patch: Refreshed. | ||
447 | 442 | * debian/maas.install: Install maas-gc cronjob. | ||
448 | 443 | * Add apport hook. | ||
449 | 444 | - debian/maas.apport: Add hook. | ||
450 | 445 | - debian/rules: Install with apport. | ||
451 | 446 | * debian/maas.logrotate: Add logrotate for txlongpoll and pserv logs. | ||
452 | 447 | * Create 'var/lib/media/maas/storage' on postinst to have right permissions. | ||
453 | 448 | - debian/maas.dirs: Drop dir creation. | ||
454 | 449 | - debian/maas.postinst: Create dir with correct permissions. | ||
455 | 450 | - debian/maas.postrm: Remove dir on purge. | ||
456 | 451 | |||
457 | 452 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 03 Apr 2012 14:50:34 -0400 | ||
458 | 453 | |||
459 | 454 | maas (0.1+bzr378+dfsg-0ubuntu1) precise; urgency=low | ||
460 | 455 | |||
461 | 456 | * maas.dirs: Create var/lib/maas/media/storage for juju storage. | ||
462 | 457 | * maas.postinst: | ||
463 | 458 | - Give correct permissions to above dir. | ||
464 | 459 | - stop apache2 before db upgrade, and restart after. | ||
465 | 460 | |||
466 | 461 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 29 Mar 2012 19:28:13 -0400 | ||
467 | 462 | |||
468 | 463 | maas (0.1+bzr363+dfsg-0ubuntu1) precise; urgency=low | ||
469 | 464 | |||
470 | 465 | [ Dave Walker (Daviey) ] | ||
471 | 466 | * debian/control: Add openssh-server as a Recommends, and wrap-and-sort. | ||
472 | 467 | |||
473 | 468 | [ Andres Rodriguez ] | ||
474 | 469 | * debian/maas.postinst: | ||
475 | 470 | - Do not start apache with apache2ctl. Use invoke-rc.d instead to not | ||
476 | 471 | fail in the installer. | ||
477 | 472 | - For start of postgresql before creating the DB, otherwise it will | ||
478 | 473 | fail in the installer. | ||
479 | 474 | - Add check of invoke-rc.d for syslog. | ||
480 | 475 | - Add check of invoke-rc.d for rabbitmq-server; Add check for rabbitmqctl | ||
481 | 476 | - Add db_stop, in case invoke-rc.d fails. | ||
482 | 477 | * debian/control: Tight python-django-maas dependency. | ||
483 | 478 | * debian/postrm: Add check for rabbitmqctl. | ||
484 | 479 | * debian/maas.maas-txlongpoll.upstart: Create rabbitmq longpoll user/vhost | ||
485 | 480 | and set permissions if they don't exist. Start on rabbitmq-server-running. | ||
486 | 481 | |||
487 | 482 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 27 Mar 2012 14:49:56 -0400 | ||
488 | 483 | |||
489 | 484 | maas (0.1+bzr338+dfsg-0ubuntu1) precise; urgency=low | ||
490 | 485 | |||
491 | 486 | [ Dave Walker (Daviey) ] | ||
492 | 487 | * d/patches/03-txlongpoll-config.patch: Resolve typo error from prior patch. | ||
493 | 488 | - LP: #961031 | ||
494 | 489 | |||
495 | 490 | [ Andres Rodriguez ] | ||
496 | 491 | * debian/maas.config: Don't allow reconfigure. | ||
497 | 492 | * debian/maas.postinst: Don't allow reconfigure. Run sync/migrate db on | ||
498 | 493 | all upgrades. | ||
499 | 494 | |||
500 | 495 | [ Scott Moser ] | ||
501 | 496 | * add rsylog config for logging node boots (LP: 960149) | ||
502 | 497 | |||
503 | 498 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 22 Mar 2012 10:56:58 -0400 | ||
504 | 499 | |||
505 | 500 | maas (0.1+bzr315+dfsg-0ubuntu1) precise; urgency=low | ||
506 | 501 | |||
507 | 502 | * New upstream snapshot. | ||
508 | 503 | |||
509 | 504 | [ Dave Walker ] | ||
510 | 505 | * debian/maas.postinst: Do not import ISO's at install time. | ||
511 | 506 | * debian/control: | ||
512 | 507 | - Drop run-one, it's not a requirement and currently in universe. | ||
513 | 508 | - Drop python-setproctitle, no longer required. | ||
514 | 509 | |||
515 | 510 | [ Andres Rodriguez ] | ||
516 | 511 | * debian/control: Depends on python-avahi, python-dbus, and avahi-daemon. | ||
517 | 512 | * debian/maas.postinst: | ||
518 | 513 | - Only syncdb if dbconfig db creation was selected. | ||
519 | 514 | - Set rabbitmq/longpoll settings | ||
520 | 515 | * debian/patches/03-txlongpoll-config.patch: Updated broker settings for | ||
521 | 516 | rabbitmq. | ||
522 | 517 | |||
523 | 518 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 20 Mar 2012 20:10:58 -0400 | ||
524 | 519 | |||
525 | 520 | maas (0.1+bzr300+dfsg-0ubuntu1) precise; urgency=low | ||
526 | 521 | |||
527 | 522 | * debian/patches: | ||
528 | 523 | - 01-fix-database-settings.patch: Update PSERV_URL port. | ||
529 | 524 | - 02-pserv-config.patch: Update, and set 'maas' as username. | ||
530 | 525 | - 03-longpoll-config.patch: Update. | ||
531 | 526 | * debian/maas.install: Install preseeds and snippets. | ||
532 | 527 | * debian/maas.postinst: | ||
533 | 528 | - Set password for 'maas' cobbler username (in pserv and cobbler). | ||
534 | 529 | - Set DEFAULT_MAAS_URL to IP of interface with default gateway. | ||
535 | 530 | |||
536 | 531 | -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 16 Mar 2012 14:59:16 -0400 | ||
537 | 532 | |||
538 | 533 | maas (0.1+bzr295+dfsg-0ubuntu2) precise; urgency=low | ||
539 | 534 | |||
540 | 535 | * debian/patches: | ||
541 | 536 | - 01-fix-database-settings.patch: Update to set PSERV_URL. | ||
542 | 537 | - 02-pserv-config.patch: Set port to 8001. | ||
543 | 538 | * debian/maas.postinst: Run maas-import-isos on install. | ||
544 | 539 | * debian/control: Depends on rabbitmq-server. | ||
545 | 540 | |||
546 | 541 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Mar 2012 18:14:08 -0400 | ||
547 | 542 | |||
548 | 543 | maas (0.1+bzr295+dfsg-0ubuntu1) precise; urgency=low | ||
549 | 544 | |||
550 | 545 | * debian/maas.upstart: Specify pidfile and conffile. | ||
551 | 546 | * debian/maas.postinst: | ||
552 | 547 | - Only run syncdb if dbconfig postinst file exists. | ||
553 | 548 | - Fix file permissions. | ||
554 | 549 | * debian/maas.{postrm,prerm}: Add dbconfig-common support. | ||
555 | 550 | * Add txlongpoll support for packaging: | ||
556 | 551 | - debian/control: Depends on python-txlongpoll. | ||
557 | 552 | - debian/maas.maas-longpoll.upstart: Added to start txlongpoll. | ||
558 | 553 | - debian/maas.install: Install txlongpoll.yaml | ||
559 | 554 | * debian/extras/maas: Improvements. | ||
560 | 555 | * debian/maas.maas.upstart: Moved from debian/maas.upstart. | ||
561 | 556 | * debian/maas.postinst: Touch logfile to set correct permissions (LP: #955400) | ||
562 | 557 | * debian/maas.logrotate: Add. | ||
563 | 558 | * debian/patches/03-txlongpoll-config.patch: Add default settings. | ||
564 | 559 | * debian/maas.config: Only run dbconfig-common on configure/reconfigure. | ||
565 | 560 | * Install maas_local_settings.py in /etc/maas and symlink to usr/share/maas | ||
566 | 561 | * Update references from MaaS to MAAS. | ||
567 | 562 | * Remove podebconf as templates no longer exist. | ||
568 | 563 | - debian/po: Remove. | ||
569 | 564 | - debian/control: Drop Build-Depends on po-debconf | ||
570 | 565 | |||
571 | 566 | -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 15 Mar 2012 15:28:14 -0400 | ||
572 | 567 | |||
573 | 568 | maas (0.1+bzr266+dfsg-0ubuntu1) precise; urgency=low | ||
574 | 569 | |||
575 | 570 | * Remove support for squid3 and use squid-deb-proxy instead. | ||
576 | 571 | * debian/extras/maas: Add to handle syncdb and creation of admin user. | ||
577 | 572 | * Add debconf questions to ask for user/pass: | ||
578 | 573 | - debian/maas.{template,config}: Add | ||
579 | 574 | - debian/maas.postinst: Ask debconf questions. | ||
580 | 575 | - debian/po: Add translation templates.i | ||
581 | 576 | * debian/maas.postinst: Enable wsgi module; drop squid3 steps. | ||
582 | 577 | * debian/maas.postrm: removed. | ||
583 | 578 | * debian/patches/01-fix-database-settings.patch: Custom database settings | ||
584 | 579 | and static files path. | ||
585 | 580 | * debian/{rules,maas.install}: Install maas static files in | ||
586 | 581 | 'usr/share/maas/web/static'. | ||
587 | 582 | * Integrate cobbler: | ||
588 | 583 | - debian/maas.install: Install pserv twisted plugin, and config. | ||
589 | 584 | - debian/maas.upstart: Created to start plugin daemon. | ||
590 | 585 | - debian/patches/02-pserv-config.patch: Custom pserv config. | ||
591 | 586 | * Integrate dbconfig-common: | ||
592 | 587 | - debian/maas.config: Added and default user/pass and database. | ||
593 | 588 | - debian/maas.{postinst,postrm}: Added handling for dbconfig-common | ||
594 | 589 | * debian/control: Depends on python-convoy. | ||
595 | 590 | * debian/rules: Update path to removal of dsfg files. | ||
596 | 591 | * debian/patches/01-fix-database-settings.patch: Updated. | ||
597 | 592 | |||
598 | 593 | -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 13 Mar 2012 14:31:50 -0400 | ||
599 | 594 | |||
600 | 595 | maas (0.1+bzr232+dfsg-0ubuntu1) precise; urgency=low | ||
601 | 596 | |||
602 | 597 | * New upstream snapshot. | ||
603 | 598 | |||
604 | 599 | [ Dave Walker ] | ||
605 | 600 | * debian/control: | ||
606 | 601 | - Changed depends from psycopg2 to python-psycopg2 and dropped versioning. | ||
607 | 602 | - LP: #937982 | ||
608 | 603 | |||
609 | 604 | [ Andres Rodriguez ] | ||
610 | 605 | * debian/maas.install: Install maas-import-isos and related files. | ||
611 | 606 | * Integrate squid3 as proxy solution: | ||
612 | 607 | - debian/extras/squid.conf: Added | ||
613 | 608 | - debian/control: Depend on squid3. | ||
614 | 609 | - debian/maas.{postinst,postrm}: Handle installation/removal of custom | ||
615 | 610 | squid config file. | ||
616 | 611 | * Split into different binary packages (maas,python-django-maas). | ||
617 | 612 | - debian/maas.postinst: Handle the apache2 configuration. | ||
618 | 613 | |||
619 | 614 | -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 07 Mar 2012 12:46:17 -0500 | ||
620 | 615 | |||
621 | 616 | maas (0.1+bzr171+dfsg-0ubuntu1) precise; urgency=low | ||
622 | 617 | |||
623 | 618 | * New upstream snapshot, post 0.1 release. | ||
624 | 619 | * debian/control: | ||
625 | 620 | - Drop depends on rabbitmq-server, no longer required. | ||
626 | 621 | * debian/watch: Introduced watch file. | ||
627 | 622 | |||
628 | 623 | -- Dave Walker (Daviey) <DaveWalker@ubuntu.com> Thu, 23 Feb 2012 13:08:12 +0000 | ||
629 | 624 | |||
630 | 625 | maas (0.1~bzr146+dfsg-0ubuntu1) precise; urgency=low | ||
631 | 626 | |||
632 | 627 | * Initial release | ||
633 | 628 | |||
634 | 629 | -- Julian Edwards <julian.edwards@canonical.com> Thu, 16 Jan 2012 15:29:07 +0000 | ||
635 | 0 | 630 | ||
636 | === added file 'debian/compat' | |||
637 | --- debian/compat 1970-01-01 00:00:00 +0000 | |||
638 | +++ debian/compat 2012-11-13 12:12:21 +0000 | |||
639 | @@ -0,0 +1,1 @@ | |||
640 | 1 | 7 | ||
641 | 0 | 2 | ||
642 | === added file 'debian/control' | |||
643 | --- debian/control 1970-01-01 00:00:00 +0000 | |||
644 | +++ debian/control 2012-11-13 12:12:21 +0000 | |||
645 | @@ -0,0 +1,275 @@ | |||
646 | 1 | Source: maas | ||
647 | 2 | Section: net | ||
648 | 3 | Priority: optional | ||
649 | 4 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | ||
650 | 5 | Build-Depends: debhelper (>= 8.1.0~), | ||
651 | 6 | dh-apport, | ||
652 | 7 | po-debconf, | ||
653 | 8 | python (>= 2.7), | ||
654 | 9 | python-distribute, | ||
655 | 10 | python-django | ||
656 | 11 | Standards-Version: 3.9.3 | ||
657 | 12 | X-Python-Version: >= 2.7 | ||
658 | 13 | XS-Testsuite: autopkgtest | ||
659 | 14 | Homepage: https://launchpad.net/maas | ||
660 | 15 | |||
661 | 16 | Package: maas | ||
662 | 17 | Architecture: all | ||
663 | 18 | Pre-Depends: ${misc:Pre-Depends} | ||
664 | 19 | Depends: maas-cluster-controller, maas-region-controller, python-django-maas | ||
665 | 20 | Conflicts: dnsmasq, maas-provision, tftpd-hpa | ||
666 | 21 | Replaces: maas-provision | ||
667 | 22 | Description: Ubuntu MAAS Server | ||
668 | 23 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
669 | 24 | nice UI to provision your Ubuntu servers. Each physical server | ||
670 | 25 | (“node”) will be commissioned automatically on first boot. | ||
671 | 26 | During the commissioning process administrators are able to | ||
672 | 27 | configure hardware settings manually before an automated smoke | ||
673 | 28 | test and burn-in test are done. Once commissioned, a node can | ||
674 | 29 | be deployed on demand by name, or allocated to a queue for | ||
675 | 30 | dynamic allocation to services being deployed on this MAAS. | ||
676 | 31 | . | ||
677 | 32 | This package installs a complete MAAS service on a single machine. | ||
678 | 33 | |||
679 | 34 | Package: maas-common | ||
680 | 35 | Architecture: all | ||
681 | 36 | Depends: ${python:Depends} | ||
682 | 37 | Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) | ||
683 | 38 | Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) | ||
684 | 39 | Description: Ubuntu MAAS Server | ||
685 | 40 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
686 | 41 | nice UI to provision your Ubuntu servers. Each physical server | ||
687 | 42 | (“node”) will be commissioned automatically on first boot. | ||
688 | 43 | During the commissioning process administrators are able to | ||
689 | 44 | configure hardware settings manually before an automated smoke | ||
690 | 45 | test and burn-in test are done. Once commissioned, a node can | ||
691 | 46 | be deployed on demand by name, or allocated to a queue for | ||
692 | 47 | dynamic allocation to services being deployed on this MAAS. | ||
693 | 48 | . | ||
694 | 49 | This package contains common files | ||
695 | 50 | |||
696 | 51 | Package: maas-region-controller | ||
697 | 52 | Architecture: all | ||
698 | 53 | Depends: apache2, | ||
699 | 54 | avahi-daemon, | ||
700 | 55 | dbconfig-common, | ||
701 | 56 | distro-info, | ||
702 | 57 | libapache2-mod-wsgi, | ||
703 | 58 | libjs-raphael, | ||
704 | 59 | libjs-yui3-full, | ||
705 | 60 | libjs-yui3-min, | ||
706 | 61 | maas-common (= ${binary:Version}), | ||
707 | 62 | postgresql-9.1, | ||
708 | 63 | pwgen, | ||
709 | 64 | python-django, | ||
710 | 65 | python-django-maas (= ${binary:Version}), | ||
711 | 66 | python-django-piston, | ||
712 | 67 | python-django-south, | ||
713 | 68 | python-maas-provisioningserver (= ${binary:Version}), | ||
714 | 69 | rabbitmq-server, | ||
715 | 70 | rsyslog, | ||
716 | 71 | squid-deb-proxy, | ||
717 | 72 | ${misc:Depends}, | ||
718 | 73 | ${python:Depends} | ||
719 | 74 | Recommends: openssh-server | ||
720 | 75 | Suggests: maas-dns | ||
721 | 76 | Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) | ||
722 | 77 | Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) | ||
723 | 78 | Description: Ubuntu MAAS Server | ||
724 | 79 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
725 | 80 | nice UI to provision your Ubuntu servers. Each physical server | ||
726 | 81 | (“node”) will be commissioned automatically on first boot. | ||
727 | 82 | During the commissioning process administrators are able to | ||
728 | 83 | configure hardware settings manually before an automated smoke | ||
729 | 84 | test and burn-in test are done. Once commissioned, a node can | ||
730 | 85 | be deployed on demand by name, or allocated to a queue for | ||
731 | 86 | dynamic allocation to services being deployed on this MAAS. | ||
732 | 87 | . | ||
733 | 88 | This package installs the region controller services: the web | ||
734 | 89 | UI and the database. | ||
735 | 90 | |||
736 | 91 | Package: python-maas-provisioningserver | ||
737 | 92 | Architecture: all | ||
738 | 93 | Depends: python-celery, | ||
739 | 94 | python-formencode, | ||
740 | 95 | python-lockfile, | ||
741 | 96 | python-lxml, | ||
742 | 97 | python-maas-client, | ||
743 | 98 | python-netifaces, | ||
744 | 99 | python-oops, | ||
745 | 100 | python-oops-amqp, | ||
746 | 101 | python-oops-datedir-repo, | ||
747 | 102 | python-oops-twisted, | ||
748 | 103 | python-pyparsing, | ||
749 | 104 | python-tempita, | ||
750 | 105 | python-twisted-core, | ||
751 | 106 | python-twisted-web, | ||
752 | 107 | python-txamqp, | ||
753 | 108 | python-txtftp, | ||
754 | 109 | python-yaml, | ||
755 | 110 | python-zope.interface, | ||
756 | 111 | ${misc:Depends}, | ||
757 | 112 | ${python:Depends} | ||
758 | 113 | Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3) | ||
759 | 114 | Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3) | ||
760 | 115 | Description: Ubuntu MAAS Server | ||
761 | 116 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
762 | 117 | nice UI to provision your Ubuntu servers. Each physical server | ||
763 | 118 | (“node”) will be commissioned automatically on first boot. | ||
764 | 119 | During the commissioning process administrators are able to | ||
765 | 120 | configure hardware settings manually before an automated smoke | ||
766 | 121 | test and burn-in test are done. Once commissioned, a node can | ||
767 | 122 | be deployed on demand by name, or allocated to a queue for | ||
768 | 123 | dynamic allocation to services being deployed on this MAAS. | ||
769 | 124 | . | ||
770 | 125 | This package contains the provisioning server libraries. | ||
771 | 126 | |||
772 | 127 | Package: maas-cli | ||
773 | 128 | Architecture: all | ||
774 | 129 | Depends: python-bzrlib, | ||
775 | 130 | python-httplib2, | ||
776 | 131 | python-maas-client (= ${binary:Version}), | ||
777 | 132 | python-oauth, | ||
778 | 133 | ${misc:Depends}, | ||
779 | 134 | ${python:Depends} | ||
780 | 135 | Description: Ubuntu MAAS Client Tool | ||
781 | 136 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
782 | 137 | nice UI to provision your Ubuntu servers. Each physical server | ||
783 | 138 | (“node”) will be commissioned automatically on first boot. | ||
784 | 139 | During the commissioning process administrators are able to | ||
785 | 140 | configure hardware settings manually before an automated smoke | ||
786 | 141 | test and burn-in test are done. Once commissioned, a node can | ||
787 | 142 | be deployed on demand by name, or allocated to a queue for | ||
788 | 143 | dynamic allocation to services being deployed on this MAAS. | ||
789 | 144 | . | ||
790 | 145 | This package contains the client command line tool. | ||
791 | 146 | |||
792 | 147 | Package: python-maas-client | ||
793 | 148 | Architecture: all | ||
794 | 149 | Depends: python-oauth, ${misc:Depends}, ${python:Depends} | ||
795 | 150 | Conflicts: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ) | ||
796 | 151 | Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ) | ||
797 | 152 | Description: Ubuntu MAAS API Client - (python files) | ||
798 | 153 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
799 | 154 | nice UI to provision your Ubuntu servers. Each physical server | ||
800 | 155 | (“node”) will be commissioned automatically on first boot. | ||
801 | 156 | During the commissioning process administrators are able to | ||
802 | 157 | configure hardware settings manually before an automated smoke | ||
803 | 158 | test and burn-in test are done. Once commissioned, a node can | ||
804 | 159 | be deployed on demand by name, or allocated to a queue for | ||
805 | 160 | dynamic allocation to services being deployed on this MAAS. | ||
806 | 161 | . | ||
807 | 162 | This package contains the client API Python modules. | ||
808 | 163 | |||
809 | 164 | Package: maas-cluster-controller | ||
810 | 165 | Architecture: all | ||
811 | 166 | Depends: bind9utils, | ||
812 | 167 | freeipmi-tools, | ||
813 | 168 | maas-cli (=${binary:Version}), | ||
814 | 169 | maas-common (=${binary:Version}), | ||
815 | 170 | python-celery, | ||
816 | 171 | python-httplib2, | ||
817 | 172 | python-lockfile, | ||
818 | 173 | python-maas-provisioningserver (=${binary:Version}), | ||
819 | 174 | python-netaddr, | ||
820 | 175 | python-oauth, | ||
821 | 176 | python-tempita, | ||
822 | 177 | python-twisted, | ||
823 | 178 | python-zope.interface, | ||
824 | 179 | rsyslog, | ||
825 | 180 | syslinux-common, | ||
826 | 181 | tgt, | ||
827 | 182 | uuid-runtime, | ||
828 | 183 | wget, | ||
829 | 184 | ${misc:Depends}, | ||
830 | 185 | ${python:Depends} | ||
831 | 186 | Suggests: maas-dhcp (= ${binary:Version}) | ||
832 | 187 | Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) | ||
833 | 188 | Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) | ||
834 | 189 | Description: Ubuntu MAAS Cluster Controller | ||
835 | 190 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
836 | 191 | nice UI to provision your Ubuntu servers. Each physical server | ||
837 | 192 | (“node”) will be commissioned automatically on first boot. | ||
838 | 193 | During the commissioning process administrators are able to | ||
839 | 194 | configure hardware settings manually before an automated smoke | ||
840 | 195 | test and burn-in test are done. Once commissioned, a node can | ||
841 | 196 | be deployed on demand by name, or allocated to a queue for | ||
842 | 197 | dynamic allocation to services being deployed on this MAAS. | ||
843 | 198 | . | ||
844 | 199 | This package contains the cluster controller, which is | ||
845 | 200 | responsible for controlling remote DHCP/TFTP instances on their | ||
846 | 201 | own subnets. | ||
847 | 202 | |||
848 | 203 | Package: python-django-maas | ||
849 | 204 | Section: python | ||
850 | 205 | Architecture: all | ||
851 | 206 | Depends: python-avahi, | ||
852 | 207 | python-celery, | ||
853 | 208 | python-convoy, | ||
854 | 209 | python-dbus, | ||
855 | 210 | python-lockfile, | ||
856 | 211 | python-lxml, | ||
857 | 212 | python-maas-client (= ${binary:Version}), | ||
858 | 213 | python-netaddr, | ||
859 | 214 | python-oops, | ||
860 | 215 | python-oops-amqp, | ||
861 | 216 | python-oops-datedir-repo, | ||
862 | 217 | python-oops-twisted, | ||
863 | 218 | python-oops-wsgi, | ||
864 | 219 | python-psycopg2, | ||
865 | 220 | python-sphinx, | ||
866 | 221 | python-tempita, | ||
867 | 222 | python-twisted, | ||
868 | 223 | python-txamqp, | ||
869 | 224 | python-txlongpoll, | ||
870 | 225 | python-zope.interface, | ||
871 | 226 | ${misc:Depends}, | ||
872 | 227 | ${python:Depends} | ||
873 | 228 | Description: Ubuntu MAAS Server - (django files) | ||
874 | 229 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
875 | 230 | nice UI to provision your Ubuntu servers. Each physical server | ||
876 | 231 | (“node”) will be commissioned automatically on first boot. | ||
877 | 232 | During the commissioning process administrators are able to | ||
878 | 233 | configure hardware settings manually before an automated smoke | ||
879 | 234 | test and burn-in test are done. Once commissioned, a node can | ||
880 | 235 | be deployed on demand by name, or allocated to a queue for | ||
881 | 236 | dynamic allocation to services being deployed on this MAAS. | ||
882 | 237 | . | ||
883 | 238 | This package contains the Django files. | ||
884 | 239 | |||
885 | 240 | Package: maas-dhcp | ||
886 | 241 | Architecture: all | ||
887 | 242 | Depends: isc-dhcp-server, ${misc:Depends} | ||
888 | 243 | Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) | ||
889 | 244 | Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) | ||
890 | 245 | Description: Ubuntu MAAS Server - DHCP Configuration (meta-package) | ||
891 | 246 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
892 | 247 | nice UI to provision your Ubuntu servers. Each physical server | ||
893 | 248 | (“node”) will be commissioned automatically on first boot. | ||
894 | 249 | During the commissioning process administrators are able to | ||
895 | 250 | configure hardware settings manually before an automated smoke | ||
896 | 251 | test and burn-in test are done. Once commissioned, a node can | ||
897 | 252 | be deployed on demand by name, or allocated to a queue for | ||
898 | 253 | dynamic allocation to services being deployed on this MAAS. | ||
899 | 254 | . | ||
900 | 255 | This package configures a DHCP that can be used with MAAS. | ||
901 | 256 | |||
902 | 257 | Package: maas-dns | ||
903 | 258 | Architecture: all | ||
904 | 259 | Depends: bind9, | ||
905 | 260 | maas-region-controller (= ${binary:Version}), | ||
906 | 261 | maas-dhcp (= ${binary:Version}), | ||
907 | 262 | ${misc:Depends} | ||
908 | 263 | Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) | ||
909 | 264 | Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) | ||
910 | 265 | Description: Ubuntu MAAS Server - DNS configuration (metapackage) | ||
911 | 266 | Ubuntu MAAS Server is the successor to Orchestra. It offers a | ||
912 | 267 | nice UI to provision your Ubuntu servers. Each physical server | ||
913 | 268 | (“node”) will be commissioned automatically on first boot. | ||
914 | 269 | During the commissioning process administrators are able to | ||
915 | 270 | configure hardware settings manually before an automated smoke | ||
916 | 271 | test and burn-in test are done. Once commissioned, a node can | ||
917 | 272 | be deployed on demand by name, or allocated to a queue for | ||
918 | 273 | dynamic allocation to services being deployed on this MAAS. | ||
919 | 274 | . | ||
920 | 275 | This package configures a DNS that can be used with MAAS. | ||
921 | 0 | 276 | ||
922 | === added file 'debian/copyright' | |||
923 | --- debian/copyright 1970-01-01 00:00:00 +0000 | |||
924 | +++ debian/copyright 2012-11-13 12:12:21 +0000 | |||
925 | @@ -0,0 +1,25 @@ | |||
926 | 1 | Format: http://dep.debian.net/deps/dep5 | ||
927 | 2 | Upstream-Name: maas | ||
928 | 3 | Source: https://launchpad.net/maas | ||
929 | 4 | |||
930 | 5 | Files: * | ||
931 | 6 | Copyright: 2012 Canonical Ltd. | ||
932 | 7 | License: AGPL-3.0+ | ||
933 | 8 | |||
934 | 9 | Files: debian/* | ||
935 | 10 | Copyright: 2012 Canonical Ltd. | ||
936 | 11 | License: AGPL-3.0+ | ||
937 | 12 | |||
938 | 13 | License: AGPL-3.0+ | ||
939 | 14 | This program is free software: you can redistribute it and/or modify | ||
940 | 15 | it under the terms of the GNU Affero General Public License as | ||
941 | 16 | published by the Free Software Foundation, either version 3 of the | ||
942 | 17 | License, or (at your option) any later version. | ||
943 | 18 | . | ||
944 | 19 | This program is distributed in the hope that it will be useful, | ||
945 | 20 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
946 | 21 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
947 | 22 | GNU Affero General Public License for more details. | ||
948 | 23 | . | ||
949 | 24 | You should have received a copy of the GNU Affero General Public License | ||
950 | 25 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
951 | 0 | 26 | ||
952 | === added directory 'debian/extras' | |||
953 | === added file 'debian/extras/20-maas.conf' | |||
954 | --- debian/extras/20-maas.conf 1970-01-01 00:00:00 +0000 | |||
955 | +++ debian/extras/20-maas.conf 2012-11-13 12:12:21 +0000 | |||
956 | @@ -0,0 +1,32 @@ | |||
957 | 1 | # Enable the udp server for installation logging | ||
958 | 2 | $ModLoad imudp | ||
959 | 3 | $UDPServerRun 514 | ||
960 | 4 | $ModLoad imtcp # load TCP listener | ||
961 | 5 | |||
962 | 6 | # The following section (certificates) was copied from orchestra, but is | ||
963 | 7 | # not used here. In the future, if we needed secure ssl, then re-enable. | ||
964 | 8 | # These files were created in the orchestra-logging-server's postinst | ||
965 | 9 | # | ||
966 | 10 | ## make gtls driver the default | ||
967 | 11 | #$DefaultNetstreamDriver gtls | ||
968 | 12 | # | ||
969 | 13 | ## certificate files | ||
970 | 14 | #$DefaultNetstreamDriverCAFile /var/lib/maas/ssl-cert-orchestra-ca.pem | ||
971 | 15 | #$DefaultNetstreamDriverCertFile /var/lib/maas/.ssl/ssl-cert-orchestra.pem | ||
972 | 16 | #$DefaultNetstreamDriverKeyFile /var/lib/maas/.ssl/ssl-cert-orchestra-pk.pem | ||
973 | 17 | # | ||
974 | 18 | #$InputTCPServerStreamDriverMode 1 # run driver in TLS-only mode | ||
975 | 19 | #$InputTCPServerStreamDriverAuthMode anon # client is NOT authenticated | ||
976 | 20 | #$InputTCPServerRun 10514 # start up listener at port 10514 | ||
977 | 21 | |||
978 | 22 | # Reduce message repetition | ||
979 | 23 | $RepeatedMsgReduction on | ||
980 | 24 | ##$RepeatedMsgContainsOrigionalMsg on | ||
981 | 25 | |||
982 | 26 | # Message templating | ||
983 | 27 | $template MAASboot,"/var/log/maas/rsyslog/%HOSTNAME%/%$YEAR%/%$MONTH%/%$DAY%/messages" | ||
984 | 28 | |||
985 | 29 | :fromhost-ip, !isequal, "127.0.0.1" ?MAASboot | ||
986 | 30 | # Stop messages that came from anywhere else from going into other places | ||
987 | 31 | # like /var/log/syslog. If you want to see these messages there, then comment below | ||
988 | 32 | & ~ | ||
989 | 0 | 33 | ||
990 | === added file 'debian/extras/99-maas' | |||
991 | --- debian/extras/99-maas 1970-01-01 00:00:00 +0000 | |||
992 | +++ debian/extras/99-maas 2012-11-13 12:12:21 +0000 | |||
993 | @@ -0,0 +1,4 @@ | |||
994 | 1 | # /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas | ||
995 | 2 | # | ||
996 | 3 | # Enable launchpad personal package archives for squid-deb-proxy | ||
997 | 4 | ppa.launchpad.net | ||
998 | 0 | 5 | ||
999 | === added file 'debian/extras/99-maas-sudoers' | |||
1000 | --- debian/extras/99-maas-sudoers 1970-01-01 00:00:00 +0000 | |||
1001 | +++ debian/extras/99-maas-sudoers 2012-11-13 12:12:21 +0000 | |||
1002 | @@ -0,0 +1,3 @@ | |||
1003 | 1 | maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart | ||
1004 | 2 | maas ALL= NOPASSWD: /usr/sbin/maas-provision | ||
1005 | 3 | maas ALL= NOPASSWD: /usr/sbin/maas-import-pxe-files | ||
1006 | 0 | 4 | ||
1007 | === added file 'debian/extras/isc-dhcp-server.override' | |||
1008 | --- debian/extras/isc-dhcp-server.override 1970-01-01 00:00:00 +0000 | |||
1009 | +++ debian/extras/isc-dhcp-server.override 2012-11-13 12:12:21 +0000 | |||
1010 | @@ -0,0 +1,1 @@ | |||
1011 | 1 | manual | ||
1012 | 0 | 2 | ||
1013 | === added file 'debian/extras/maas' | |||
1014 | --- debian/extras/maas 1970-01-01 00:00:00 +0000 | |||
1015 | +++ debian/extras/maas 2012-11-13 12:12:21 +0000 | |||
1016 | @@ -0,0 +1,8 @@ | |||
1017 | 1 | #!/bin/sh | ||
1018 | 2 | if [ "$(id -u)" != "0" ]; then | ||
1019 | 3 | echo "This utility may only be run as root." 1>&2 | ||
1020 | 4 | exit 1 | ||
1021 | 5 | fi | ||
1022 | 6 | export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}" | ||
1023 | 7 | export DJANGO_SETTINGS_MODULE="maas.settings" | ||
1024 | 8 | exec /usr/bin/django-admin "$@" | ||
1025 | 0 | 9 | ||
1026 | === added file 'debian/extras/maas-cli' | |||
1027 | --- debian/extras/maas-cli 1970-01-01 00:00:00 +0000 | |||
1028 | +++ debian/extras/maas-cli 2012-11-13 12:12:21 +0000 | |||
1029 | @@ -0,0 +1,2 @@ | |||
1030 | 1 | #!/bin/sh | ||
1031 | 2 | exec python -m maascli "$@" | ||
1032 | 0 | 3 | ||
1033 | === added file 'debian/extras/maas-provision' | |||
1034 | --- debian/extras/maas-provision 1970-01-01 00:00:00 +0000 | |||
1035 | +++ debian/extras/maas-provision 2012-11-13 12:12:21 +0000 | |||
1036 | @@ -0,0 +1,7 @@ | |||
1037 | 1 | #!/bin/sh | ||
1038 | 2 | if [ "$(id -u)" != "0" ]; then | ||
1039 | 3 | echo "This utility may only be run as root." 1>&2 | ||
1040 | 4 | exit 1 | ||
1041 | 5 | fi | ||
1042 | 6 | export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}" | ||
1043 | 7 | exec /usr/bin/python -m provisioningserver "$@" | ||
1044 | 0 | 8 | ||
1045 | === added file 'debian/extras/maas-region-celeryd' | |||
1046 | --- debian/extras/maas-region-celeryd 1970-01-01 00:00:00 +0000 | |||
1047 | +++ debian/extras/maas-region-celeryd 2012-11-13 12:12:21 +0000 | |||
1048 | @@ -0,0 +1,50 @@ | |||
1049 | 1 | #!/usr/bin/python | ||
1050 | 2 | import os | ||
1051 | 3 | from grp import getgrnam | ||
1052 | 4 | from pwd import getpwnam | ||
1053 | 5 | |||
1054 | 6 | def start_celery(args): | ||
1055 | 7 | uid = getpwnam(args.user).pw_uid | ||
1056 | 8 | gid = getgrnam(args.group).gr_gid | ||
1057 | 9 | |||
1058 | 10 | env = dict(os.environ, PYTHONPATH="/usr/share/maas") | ||
1059 | 11 | |||
1060 | 12 | command = [ | ||
1061 | 13 | 'celeryd', | ||
1062 | 14 | '--logfile=%s' % args.logfile, | ||
1063 | 15 | '--schedule=%s' % args.schedule, | ||
1064 | 16 | '--loglevel=INFO', | ||
1065 | 17 | '--beat', | ||
1066 | 18 | '--queues=celery,master', | ||
1067 | 19 | ] | ||
1068 | 20 | |||
1069 | 21 | # Change gid first, just in case changing the uid might deprive | ||
1070 | 22 | # us of the privileges required to setgid. | ||
1071 | 23 | os.setgid(gid) | ||
1072 | 24 | os.setuid(uid) | ||
1073 | 25 | |||
1074 | 26 | os.execvpe(command[0], command, env=env) | ||
1075 | 27 | |||
1076 | 28 | def main(): | ||
1077 | 29 | import argparse | ||
1078 | 30 | parser = argparse.ArgumentParser( | ||
1079 | 31 | description='MAAS celery daemon config options') | ||
1080 | 32 | parser.add_argument( | ||
1081 | 33 | '--user', '-u', metavar='USER', default='maas', | ||
1082 | 34 | help="System user identity that should run the cluster controller.") | ||
1083 | 35 | parser.add_argument( | ||
1084 | 36 | '--group', '-g', metavar='GROUP', default='maas', | ||
1085 | 37 | help="System group that should run the cluster controller.") | ||
1086 | 38 | parser.add_argument( | ||
1087 | 39 | '--logfile', '-l', metavar='LOGFILE', default='/var/log/maas/celery-region.log', | ||
1088 | 40 | help="Location of the logfile.") | ||
1089 | 41 | parser.add_argument( | ||
1090 | 42 | '--schedule', '-s', metavar='SCHEDULE', default='/var/lib/maas/celerybeat-region-schedule', | ||
1091 | 43 | help="Location of the beat schedule file.") | ||
1092 | 44 | |||
1093 | 45 | args = args = parser.parse_args() | ||
1094 | 46 | |||
1095 | 47 | start_celery(args) | ||
1096 | 48 | |||
1097 | 49 | if __name__ == '__main__': | ||
1098 | 50 | main() | ||
1099 | 0 | 51 | ||
1100 | === added file 'debian/extras/maas_remote_syslog_compress' | |||
1101 | --- debian/extras/maas_remote_syslog_compress 1970-01-01 00:00:00 +0000 | |||
1102 | +++ debian/extras/maas_remote_syslog_compress 2012-11-13 12:12:21 +0000 | |||
1103 | @@ -0,0 +1,2 @@ | |||
1104 | 1 | # Compress log files not changed in more than 48 hours: | ||
1105 | 2 | 30 4 * * * root find /var/log/maas/rsyslog -type f -mtime +2 -exec bzip2 '{}' \; | ||
1106 | 0 | 3 | ||
1107 | === added file 'debian/maas-cli.install' | |||
1108 | --- debian/maas-cli.install 1970-01-01 00:00:00 +0000 | |||
1109 | +++ debian/maas-cli.install 2012-11-13 12:12:21 +0000 | |||
1110 | @@ -0,0 +1,2 @@ | |||
1111 | 1 | debian/extras/maas-cli usr/bin | ||
1112 | 2 | debian/tmp/usr/lib/python*/dist-packages/maascli | ||
1113 | 0 | 3 | ||
1114 | === added file 'debian/maas-cluster-controller.config' | |||
1115 | --- debian/maas-cluster-controller.config 1970-01-01 00:00:00 +0000 | |||
1116 | +++ debian/maas-cluster-controller.config 2012-11-13 12:12:21 +0000 | |||
1117 | @@ -0,0 +1,31 @@ | |||
1118 | 1 | #!/bin/sh -e | ||
1119 | 2 | |||
1120 | 3 | . /usr/share/debconf/confmodule | ||
1121 | 4 | db_version 2.0 | ||
1122 | 5 | |||
1123 | 6 | # Only ask for new installations and reconfiguring. | ||
1124 | 7 | # XXX Fix to not ask when installing from the CD. | ||
1125 | 8 | if ([ "$1" = "configure" ] && [ -z "$2" ]); then | ||
1126 | 9 | |||
1127 | 10 | db_get maas-cluster-controller/maas-url || true | ||
1128 | 11 | if [ -n "$RET" ]; then | ||
1129 | 12 | db_set maas-cluster-controller/maas-url "$RET" | ||
1130 | 13 | else | ||
1131 | 14 | # Attempt to pre-populate if installing on the region controller. | ||
1132 | 15 | if [ -e /etc/maas/maas_local_settings.py ]; then | ||
1133 | 16 | url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py) | ||
1134 | 17 | db_set maas-cluster-controller/maas-url "$url" | ||
1135 | 18 | else | ||
1136 | 19 | # Will only get here if dbconf value not already set, or | ||
1137 | 20 | # /etc/maas/maas_local_settings.py doesn't exist. | ||
1138 | 21 | db_input medium maas-cluster-controller/maas-url || true | ||
1139 | 22 | db_go | ||
1140 | 23 | fi | ||
1141 | 24 | fi | ||
1142 | 25 | fi | ||
1143 | 26 | |||
1144 | 27 | if [ "$1" = "reconfigure" ]; then | ||
1145 | 28 | db_input high maas-cluster-controller/maas-url || true | ||
1146 | 29 | db_go | ||
1147 | 30 | fi | ||
1148 | 31 | #DEBHELPER# | ||
1149 | 0 | 32 | ||
1150 | === added file 'debian/maas-cluster-controller.dirs' | |||
1151 | --- debian/maas-cluster-controller.dirs 1970-01-01 00:00:00 +0000 | |||
1152 | +++ debian/maas-cluster-controller.dirs 2012-11-13 12:12:21 +0000 | |||
1153 | @@ -0,0 +1,1 @@ | |||
1154 | 1 | etc/maas | ||
1155 | 0 | 2 | ||
1156 | === added file 'debian/maas-cluster-controller.install' | |||
1157 | --- debian/maas-cluster-controller.install 1970-01-01 00:00:00 +0000 | |||
1158 | +++ debian/maas-cluster-controller.install 2012-11-13 12:12:21 +0000 | |||
1159 | @@ -0,0 +1,27 @@ | |||
1160 | 1 | # Install twisted plugins | ||
1161 | 2 | twisted/plugins/maasps.py usr/share/pyshared/twisted/plugins | ||
1162 | 3 | |||
1163 | 4 | # Install PSERV config file | ||
1164 | 5 | debian/tmp/etc/maas/pserv.yaml | ||
1165 | 6 | |||
1166 | 7 | # Install cluster config file | ||
1167 | 8 | debian/tmp/etc/maas/maas_cluster.conf | ||
1168 | 9 | |||
1169 | 10 | # Install celery config file | ||
1170 | 11 | debian/tmp/usr/share/maas/celeryconfig_cluster.py | ||
1171 | 12 | |||
1172 | 13 | # Install local celery cluster config file | ||
1173 | 14 | debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py | ||
1174 | 15 | |||
1175 | 16 | # Install maas-import-pxe-files and related files | ||
1176 | 17 | debian/tmp/usr/sbin/maas-import-pxe-files | ||
1177 | 18 | etc/cron.d/maas-import-pxe-files | ||
1178 | 19 | man/maas-import-pxe-files.8 usr/share/man/man8 | ||
1179 | 20 | debian/tmp/etc/maas/import_pxe_files | ||
1180 | 21 | debian/tmp/usr/sbin/maas-import-ephemerals | ||
1181 | 22 | debian/tmp/etc/maas/import_ephemerals | ||
1182 | 23 | debian/tmp/etc/maas/commissioning-user-data | ||
1183 | 24 | |||
1184 | 25 | # Install all other stuff | ||
1185 | 26 | debian/extras/99-maas-sudoers etc/sudoers.d | ||
1186 | 27 | debian/extras/isc-dhcp-server.override etc/init | ||
1187 | 0 | 28 | ||
1188 | === added file 'debian/maas-cluster-controller.links' | |||
1189 | --- debian/maas-cluster-controller.links 1970-01-01 00:00:00 +0000 | |||
1190 | +++ debian/maas-cluster-controller.links 2012-11-13 12:12:21 +0000 | |||
1191 | @@ -0,0 +1,1 @@ | |||
1192 | 1 | etc/maas/maas_local_celeryconfig_cluster.py usr/share/maas/maas_local_celeryconfig_cluster.py | ||
1193 | 0 | 2 | ||
1194 | === added file 'debian/maas-cluster-controller.logrotate' | |||
1195 | --- debian/maas-cluster-controller.logrotate 1970-01-01 00:00:00 +0000 | |||
1196 | +++ debian/maas-cluster-controller.logrotate 2012-11-13 12:12:21 +0000 | |||
1197 | @@ -0,0 +1,9 @@ | |||
1198 | 1 | /var/log/maas/pserv.log { | ||
1199 | 2 | rotate 5 | ||
1200 | 3 | weekly | ||
1201 | 4 | compress | ||
1202 | 5 | missingok | ||
1203 | 6 | postrotate | ||
1204 | 7 | [ -r /var/run/maas-pserv.pid ] && kill -s USR2 $(cat /var/run/maas-pserv.pid) || true | ||
1205 | 8 | endscript | ||
1206 | 9 | } | ||
1207 | 0 | 10 | ||
1208 | === added file 'debian/maas-cluster-controller.maas-cluster-celery.upstart' | |||
1209 | --- debian/maas-cluster-controller.maas-cluster-celery.upstart 1970-01-01 00:00:00 +0000 | |||
1210 | +++ debian/maas-cluster-controller.maas-cluster-celery.upstart 2012-11-13 12:12:21 +0000 | |||
1211 | @@ -0,0 +1,26 @@ | |||
1212 | 1 | # maas-cluster-controller - provisioning service | ||
1213 | 2 | # | ||
1214 | 3 | # MAAS Cluster Controller Service | ||
1215 | 4 | |||
1216 | 5 | description "MAAS Cluster Controller" | ||
1217 | 6 | author "Julian Edwards <julian.edwards@canonical.com>" | ||
1218 | 7 | |||
1219 | 8 | start on filesystem and net-device-up | ||
1220 | 9 | stop on runlevel [016] | ||
1221 | 10 | |||
1222 | 11 | env CONFIG_FILE=/etc/maas/maas_cluster.conf | ||
1223 | 12 | # Use cluster config. | ||
1224 | 13 | env CELERY_CONFIG_MODULE="celeryconfig_cluster" | ||
1225 | 14 | |||
1226 | 15 | pre-start script | ||
1227 | 16 | if [ ! -f $CONFIG_FILE ]; then | ||
1228 | 17 | echo "$CONFIG_FILE does not exist. Aborting." | ||
1229 | 18 | stop | ||
1230 | 19 | exit 0 | ||
1231 | 20 | fi | ||
1232 | 21 | end script | ||
1233 | 22 | |||
1234 | 23 | script | ||
1235 | 24 | . $CONFIG_FILE # sets MAAS_URL | ||
1236 | 25 | exec /usr/sbin/maas-provision start-cluster-controller $MAAS_URL -u maas -g maas | ||
1237 | 26 | end script | ||
1238 | 0 | 27 | ||
1239 | === added file 'debian/maas-cluster-controller.maas-pserv.upstart' | |||
1240 | --- debian/maas-cluster-controller.maas-pserv.upstart 1970-01-01 00:00:00 +0000 | |||
1241 | +++ debian/maas-cluster-controller.maas-pserv.upstart 2012-11-13 12:12:21 +0000 | |||
1242 | @@ -0,0 +1,14 @@ | |||
1243 | 1 | # maas-pserv - provisioning service | ||
1244 | 2 | # | ||
1245 | 3 | # MAAS Provisioning Service | ||
1246 | 4 | |||
1247 | 5 | description "MAAS" | ||
1248 | 6 | author "Andres Rodriguez <andres.rodriguez@canonical.com>" | ||
1249 | 7 | |||
1250 | 8 | start on filesystem and net-device-up | ||
1251 | 9 | stop on runlevel [016] | ||
1252 | 10 | |||
1253 | 11 | respawn | ||
1254 | 12 | |||
1255 | 13 | # To add options to your daemon, edit the line below: | ||
1256 | 14 | exec /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-pserv.pid --logfile=/dev/null maas-pserv --config-file=/etc/maas/pserv.yaml | ||
1257 | 0 | 15 | ||
1258 | === added file 'debian/maas-cluster-controller.postinst' | |||
1259 | --- debian/maas-cluster-controller.postinst 1970-01-01 00:00:00 +0000 | |||
1260 | +++ debian/maas-cluster-controller.postinst 2012-11-13 12:12:21 +0000 | |||
1261 | @@ -0,0 +1,62 @@ | |||
1262 | 1 | #!/bin/sh -e | ||
1263 | 2 | |||
1264 | 3 | . /usr/share/debconf/confmodule | ||
1265 | 4 | db_version 2.0 | ||
1266 | 5 | |||
1267 | 6 | create_log_dir() { | ||
1268 | 7 | # create log dir | ||
1269 | 8 | if [ ! -d /var/lib/maas ]; then | ||
1270 | 9 | mkdir -p /var/lib/maas | ||
1271 | 10 | fi | ||
1272 | 11 | if [ ! -d /var/log/maas/oops ]; then | ||
1273 | 12 | mkdir -p /var/log/maas/oops | ||
1274 | 13 | fi | ||
1275 | 14 | # Give appropriate permissions | ||
1276 | 15 | chown -R maas:maas /var/lib/maas/ | ||
1277 | 16 | chown -R maas:maas /var/log/maas | ||
1278 | 17 | chmod -R 775 /var/log/maas/oops | ||
1279 | 18 | } | ||
1280 | 19 | |||
1281 | 20 | configure_maas_tgt(){ | ||
1282 | 21 | # Set up iSCSI: add maas.conf to tgt conf.d. | ||
1283 | 22 | local tgtcfg="/etc/tgt/targets.conf" | ||
1284 | 23 | [ -d /etc/tgt/conf.d/ ] || | ||
1285 | 24 | echo "Warning! $tgtcfg did not exist" 1>&2; | ||
1286 | 25 | mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/ | ||
1287 | 26 | ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf | ||
1288 | 27 | } | ||
1289 | 28 | |||
1290 | 29 | if [ "$1" = "configure" ] && [ -z "$2" ]; then | ||
1291 | 30 | # logging | ||
1292 | 31 | create_log_dir | ||
1293 | 32 | |||
1294 | 33 | # The local celery config may contain a private cluster UUID. Only | ||
1295 | 34 | # maas can read it; only root can write it. | ||
1296 | 35 | chown root:maas /etc/maas/maas_local_celeryconfig_cluster.py | ||
1297 | 36 | chmod 0640 /etc/maas/maas_local_celeryconfig_cluster.py | ||
1298 | 37 | |||
1299 | 38 | # Generate cluster UUID. | ||
1300 | 39 | if grep -qs "^CLUSTER_UUID\ \= None$" /etc/maas/maas_local_celeryconfig_cluster.py; then | ||
1301 | 40 | uuid="$(uuidgen)" | ||
1302 | 41 | sed -i "s|^CLUSTER_UUID\ \= None$|CLUSTER_UUID = '"$uuid"'|" \ | ||
1303 | 42 | /etc/maas/maas_local_celeryconfig_cluster.py | ||
1304 | 43 | fi | ||
1305 | 44 | |||
1306 | 45 | configure_maas_tgt | ||
1307 | 46 | fi | ||
1308 | 47 | |||
1309 | 48 | if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then | ||
1310 | 49 | |||
1311 | 50 | if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then | ||
1312 | 51 | create_log_dir | ||
1313 | 52 | fi | ||
1314 | 53 | |||
1315 | 54 | # Get the MAAS_URL on configure/reconfigure and write it to the conf file. | ||
1316 | 55 | db_get maas-cluster-controller/maas-url || true | ||
1317 | 56 | if [ -n "$RET" ]; then | ||
1318 | 57 | sed -i "s|MAAS_URL=.*|MAAS_URL="$RET"|" /etc/maas/maas_cluster.conf | ||
1319 | 58 | fi | ||
1320 | 59 | fi | ||
1321 | 60 | |||
1322 | 61 | #DEBHELPER# | ||
1323 | 62 | exit 0 | ||
1324 | 0 | 63 | ||
1325 | === added file 'debian/maas-cluster-controller.postrm' | |||
1326 | --- debian/maas-cluster-controller.postrm 1970-01-01 00:00:00 +0000 | |||
1327 | +++ debian/maas-cluster-controller.postrm 2012-11-13 12:12:21 +0000 | |||
1328 | @@ -0,0 +1,30 @@ | |||
1329 | 1 | #!/bin/sh | ||
1330 | 2 | |||
1331 | 3 | set -e | ||
1332 | 4 | |||
1333 | 5 | . /usr/share/debconf/confmodule | ||
1334 | 6 | db_version 2.0 | ||
1335 | 7 | |||
1336 | 8 | case "$1" in | ||
1337 | 9 | purge) | ||
1338 | 10 | # remove log directory | ||
1339 | 11 | if [ -d /var/log/maas ]; then | ||
1340 | 12 | rm -rf /var/log/maas | ||
1341 | 13 | fi | ||
1342 | 14 | # remove var directory | ||
1343 | 15 | rm -rf /var/lib/maas/celerybeat-cluster-schedule | ||
1344 | 16 | DIR=/var/lib/maas | ||
1345 | 17 | if [ "$(ls -A $DIR 2> /dev/null)" = "" ]; then | ||
1346 | 18 | rm -rf /var/lib/maas | ||
1347 | 19 | fi | ||
1348 | 20 | |||
1349 | 21 | # Delete symlink for iSCSI config. | ||
1350 | 22 | if [ -L /etc/tgt/conf.d/maas.conf ]; then | ||
1351 | 23 | rm -rf /etc/tgt/conf.d/maas.conf | ||
1352 | 24 | fi | ||
1353 | 25 | |||
1354 | 26 | esac | ||
1355 | 27 | |||
1356 | 28 | #DEBHELPER# | ||
1357 | 29 | |||
1358 | 30 | exit 0 | ||
1359 | 0 | 31 | ||
1360 | === added file 'debian/maas-cluster-controller.prerm' | |||
1361 | --- debian/maas-cluster-controller.prerm 1970-01-01 00:00:00 +0000 | |||
1362 | +++ debian/maas-cluster-controller.prerm 2012-11-13 12:12:21 +0000 | |||
1363 | @@ -0,0 +1,10 @@ | |||
1364 | 1 | #!/bin/sh | ||
1365 | 2 | |||
1366 | 3 | set -e | ||
1367 | 4 | |||
1368 | 5 | . /usr/share/debconf/confmodule | ||
1369 | 6 | db_version 2.0 | ||
1370 | 7 | |||
1371 | 8 | #DEBHELPER# | ||
1372 | 9 | |||
1373 | 10 | exit 0 | ||
1374 | 0 | 11 | ||
1375 | === added file 'debian/maas-cluster-controller.templates' | |||
1376 | --- debian/maas-cluster-controller.templates 1970-01-01 00:00:00 +0000 | |||
1377 | +++ debian/maas-cluster-controller.templates 2012-11-13 12:12:21 +0000 | |||
1378 | @@ -0,0 +1,7 @@ | |||
1379 | 1 | Template: maas-cluster-controller/maas-url | ||
1380 | 2 | Type: string | ||
1381 | 3 | Default: | ||
1382 | 4 | _Description: Ubuntu MAAS API address: | ||
1383 | 5 | The MAAS Cluster Controller needs to contact the MAAS server to | ||
1384 | 6 | register its presence. Set the URL to the MAAS API here, e.g. | ||
1385 | 7 | http://192.168.1.1/MAAS | ||
1386 | 0 | 8 | ||
1387 | === added file 'debian/maas-common.install' | |||
1388 | --- debian/maas-common.install 1970-01-01 00:00:00 +0000 | |||
1389 | +++ debian/maas-common.install 2012-11-13 12:12:21 +0000 | |||
1390 | @@ -0,0 +1,2 @@ | |||
1391 | 1 | # Install Celery Config | ||
1392 | 2 | debian/tmp/usr/share/maas/celeryconfig_common.py | ||
1393 | 0 | 3 | ||
1394 | === added file 'debian/maas-common.postinst' | |||
1395 | --- debian/maas-common.postinst 1970-01-01 00:00:00 +0000 | |||
1396 | +++ debian/maas-common.postinst 2012-11-13 12:12:21 +0000 | |||
1397 | @@ -0,0 +1,22 @@ | |||
1398 | 1 | #!/bin/sh -e | ||
1399 | 2 | |||
1400 | 3 | add_user_group(){ | ||
1401 | 4 | local user="maas" | ||
1402 | 5 | local group="maas" | ||
1403 | 6 | if ! getent group "$group" >/dev/null; then | ||
1404 | 7 | addgroup --quiet --system "$group" || true | ||
1405 | 8 | fi | ||
1406 | 9 | if ! getent passwd "$user" > /dev/null 2>&1; then | ||
1407 | 10 | adduser --quiet \ | ||
1408 | 11 | --system \ | ||
1409 | 12 | --group \ | ||
1410 | 13 | --no-create-home \ | ||
1411 | 14 | "$user" || true | ||
1412 | 15 | fi | ||
1413 | 16 | } | ||
1414 | 17 | |||
1415 | 18 | if [ "$1" = "configure" ]; then | ||
1416 | 19 | add_user_group | ||
1417 | 20 | fi | ||
1418 | 21 | |||
1419 | 22 | #DEBHELPER# | ||
1420 | 0 | 23 | ||
1421 | === added file 'debian/maas-common.postrm' | |||
1422 | --- debian/maas-common.postrm 1970-01-01 00:00:00 +0000 | |||
1423 | +++ debian/maas-common.postrm 2012-11-13 12:12:21 +0000 | |||
1424 | @@ -0,0 +1,13 @@ | |||
1425 | 1 | #!/bin/sh | ||
1426 | 2 | |||
1427 | 3 | set -e | ||
1428 | 4 | |||
1429 | 5 | case "$1" in | ||
1430 | 6 | purge) | ||
1431 | 7 | # Deleting user/group | ||
1432 | 8 | if getent passwd maas >/dev/null; then | ||
1433 | 9 | deluser maas || true | ||
1434 | 10 | fi | ||
1435 | 11 | esac | ||
1436 | 12 | |||
1437 | 13 | #DEBHELPER# | ||
1438 | 0 | 14 | ||
1439 | === added file 'debian/maas-dhcp.apparmor' | |||
1440 | --- debian/maas-dhcp.apparmor 1970-01-01 00:00:00 +0000 | |||
1441 | +++ debian/maas-dhcp.apparmor 2012-11-13 12:12:21 +0000 | |||
1442 | @@ -0,0 +1,7 @@ | |||
1443 | 1 | /run/maas/dhcp/ r, | ||
1444 | 2 | /run/maas/dhcp/** r, | ||
1445 | 3 | /run/maas/dhcp/*.pid lrw, | ||
1446 | 4 | /run/maas/dhcp/*.trace lrw, | ||
1447 | 5 | /run/maas/dhcp/*.leases* lrw, | ||
1448 | 6 | /var/lib/maas/dhcp/dhcpd*.leases* lrw, | ||
1449 | 7 | /etc/maas/dhcpd.conf r, | ||
1450 | 0 | 8 | ||
1451 | === added file 'debian/maas-dhcp.install' | |||
1452 | --- debian/maas-dhcp.install 1970-01-01 00:00:00 +0000 | |||
1453 | +++ debian/maas-dhcp.install 2012-11-13 12:12:21 +0000 | |||
1454 | @@ -0,0 +1,1 @@ | |||
1455 | 1 | /debian/tmp/etc/apparmor.d/dhcpd.d/maas | ||
1456 | 0 | 2 | ||
1457 | === added file 'debian/maas-dhcp.maas-dhcp-server.upstart' | |||
1458 | --- debian/maas-dhcp.maas-dhcp-server.upstart 1970-01-01 00:00:00 +0000 | |||
1459 | +++ debian/maas-dhcp.maas-dhcp-server.upstart 2012-11-13 12:12:21 +0000 | |||
1460 | @@ -0,0 +1,60 @@ | |||
1461 | 1 | description "MAAS instance of ISC DHCP server" | ||
1462 | 2 | author "Jeroen Vermeulen <jtv@canonical.com>" | ||
1463 | 3 | |||
1464 | 4 | start on runlevel [2345] | ||
1465 | 5 | stop on runlevel [!2345] | ||
1466 | 6 | |||
1467 | 7 | env CONFIG_FILE=/etc/maas/dhcpd.conf | ||
1468 | 8 | env PID_DIR=/run/maas/dhcp | ||
1469 | 9 | env PID_FILE=/run/maas/dhcp/dhcpd.pid | ||
1470 | 10 | env LEASES_DIR=/var/lib/maas/dhcp | ||
1471 | 11 | env LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases | ||
1472 | 12 | |||
1473 | 13 | # This is where we write what interfaces dhcpd should listen on. | ||
1474 | 14 | env INTERFACES_FILE=/var/lib/maas/dhcpd-interfaces | ||
1475 | 15 | |||
1476 | 16 | pre-start script | ||
1477 | 17 | if [ ! -f $CONFIG_FILE ]; then | ||
1478 | 18 | echo "$CONFIG_FILE does not exist. Aborting." | ||
1479 | 19 | stop | ||
1480 | 20 | exit 0 | ||
1481 | 21 | fi | ||
1482 | 22 | |||
1483 | 23 | if [ ! -f $INTERFACES_FILE ]; then | ||
1484 | 24 | echo "$INTERFACES_FILE does not exist. Aborting." | ||
1485 | 25 | stop | ||
1486 | 26 | exit 0 | ||
1487 | 27 | fi | ||
1488 | 28 | |||
1489 | 29 | if ! /usr/sbin/dhcpd -t -q -4 -cf $CONFIG_FILE > /dev/null 2>&1; then | ||
1490 | 30 | echo "dhcpd self-test failed. Please fix the config file." | ||
1491 | 31 | echo "The error was: " | ||
1492 | 32 | /usr/sbin/dhcpd -t -4 -cf $CONFIG_FILE | ||
1493 | 33 | stop | ||
1494 | 34 | exit 0 | ||
1495 | 35 | fi | ||
1496 | 36 | end script | ||
1497 | 37 | |||
1498 | 38 | respawn | ||
1499 | 39 | script | ||
1500 | 40 | INTERFACES=`cat "${INTERFACES_FILE}"` | ||
1501 | 41 | |||
1502 | 42 | # Allow dhcp server to write lease and pid file. | ||
1503 | 43 | mkdir -p $PID_DIR | ||
1504 | 44 | chown dhcpd:dhcpd $PID_DIR | ||
1505 | 45 | |||
1506 | 46 | # As of Quantal, the leases file must be owned by root:root (even though | ||
1507 | 47 | # the daemon will run under an unprivileged user). | ||
1508 | 48 | # In Precise, ownership was supposed to be dhcp:dhcp. | ||
1509 | 49 | mkdir -p $LEASES_DIR | ||
1510 | 50 | chown root:root $LEASES_DIR | ||
1511 | 51 | [ -e $LEASES_FILE ] || touch $LEASES_FILE | ||
1512 | 52 | for LFILE in $LEASES_FILE $LEASES_FILE~; do | ||
1513 | 53 | if [ -e $LFILE ]; then | ||
1514 | 54 | chown root:root $LFILE | ||
1515 | 55 | chmod a+r $LFILE | ||
1516 | 56 | fi | ||
1517 | 57 | done | ||
1518 | 58 | |||
1519 | 59 | exec /usr/sbin/dhcpd -user dhcpd -group dhcpd -f -q -4 -pf $PID_FILE -cf $CONFIG_FILE -lf $LEASES_FILE $INTERFACES | ||
1520 | 60 | end script | ||
1521 | 0 | 61 | ||
1522 | === added file 'debian/maas-dhcp.postinst' | |||
1523 | --- debian/maas-dhcp.postinst 1970-01-01 00:00:00 +0000 | |||
1524 | +++ debian/maas-dhcp.postinst 2012-11-13 12:12:21 +0000 | |||
1525 | @@ -0,0 +1,22 @@ | |||
1526 | 1 | #!/bin/sh -e | ||
1527 | 2 | |||
1528 | 3 | . /usr/share/debconf/confmodule | ||
1529 | 4 | db_version 2.0 | ||
1530 | 5 | |||
1531 | 6 | stop_isc_dhcp_server(){ | ||
1532 | 7 | invoke-rc.d isc-dhcp-server stop | ||
1533 | 8 | } | ||
1534 | 9 | |||
1535 | 10 | |||
1536 | 11 | if [ "$1" = "configure" ]; then | ||
1537 | 12 | stop_isc_dhcp_server | ||
1538 | 13 | |||
1539 | 14 | dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd" | ||
1540 | 15 | if [ -f "${dhcpd_prof}" ] && | ||
1541 | 16 | command -v apparmor_parser >/dev/null 2>&1; then | ||
1542 | 17 | apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" | ||
1543 | 18 | fi | ||
1544 | 19 | fi | ||
1545 | 20 | |||
1546 | 21 | #DEBHELPER# | ||
1547 | 22 | exit 0 | ||
1548 | 0 | 23 | ||
1549 | === added file 'debian/maas-dhcp.postrm' | |||
1550 | --- debian/maas-dhcp.postrm 1970-01-01 00:00:00 +0000 | |||
1551 | +++ debian/maas-dhcp.postrm 2012-11-13 12:12:21 +0000 | |||
1552 | @@ -0,0 +1,11 @@ | |||
1553 | 1 | #!/bin/sh -e | ||
1554 | 2 | |||
1555 | 3 | if [ "$1" = "remove" -o "$1" = "purge" ]; then | ||
1556 | 4 | dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd" | ||
1557 | 5 | if [ -f "${dhcpd_prof}" ] && | ||
1558 | 6 | command -v apparmor_parser >/dev/null 2>&1; then | ||
1559 | 7 | apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}" | ||
1560 | 8 | fi | ||
1561 | 9 | fi | ||
1562 | 10 | |||
1563 | 11 | #DEBHELPER# | ||
1564 | 0 | 12 | ||
1565 | === added file 'debian/maas-dns.dirs' | |||
1566 | --- debian/maas-dns.dirs 1970-01-01 00:00:00 +0000 | |||
1567 | +++ debian/maas-dns.dirs 2012-11-13 12:12:21 +0000 | |||
1568 | @@ -0,0 +1,1 @@ | |||
1569 | 1 | etc/bind/maas | ||
1570 | 0 | 2 | ||
1571 | === added file 'debian/maas-dns.postinst' | |||
1572 | --- debian/maas-dns.postinst 1970-01-01 00:00:00 +0000 | |||
1573 | +++ debian/maas-dns.postinst 2012-11-13 12:12:21 +0000 | |||
1574 | @@ -0,0 +1,35 @@ | |||
1575 | 1 | #!/bin/sh -e | ||
1576 | 2 | |||
1577 | 3 | if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then | ||
1578 | 4 | # If /etc/bind/maas is empty, set_up_dns. | ||
1579 | 5 | if [ ! "$(ls -A /etc/bind/maas)" ]; then | ||
1580 | 6 | maas set_up_dns | ||
1581 | 7 | fi | ||
1582 | 8 | |||
1583 | 9 | # Fix permissions. | ||
1584 | 10 | if [ -d /etc/bind/maas ]; then | ||
1585 | 11 | chown -R maas:root /etc/bind/maas | ||
1586 | 12 | fi | ||
1587 | 13 | if [ -f /etc/bind/maas/named.conf.maas ]; then | ||
1588 | 14 | chmod 644 /etc/bind/maas/named.conf.maas | ||
1589 | 15 | fi | ||
1590 | 16 | if [ -f /etc/bind/maas/rndc.conf.maas ]; then | ||
1591 | 17 | chmod 600 /etc/bind/maas/rndc.conf.maas | ||
1592 | 18 | fi | ||
1593 | 19 | if [ -f /etc/bind/maas/named.conf.rndc.maas ]; then | ||
1594 | 20 | chown maas:bind /etc/bind/maas/named.conf.rndc.maas | ||
1595 | 21 | chmod 640 /etc/bind/maas/named.conf.rndc.maas | ||
1596 | 22 | fi | ||
1597 | 23 | |||
1598 | 24 | # Remove any existing MAAS-related include line from | ||
1599 | 25 | # /etc/bind/named.conf.local, then re-add it. | ||
1600 | 26 | sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local | ||
1601 | 27 | maas get_named_conf --edit --config_path /etc/bind/named.conf.local | ||
1602 | 28 | |||
1603 | 29 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
1604 | 30 | invoke-rc.d bind9 restart || true | ||
1605 | 31 | fi | ||
1606 | 32 | fi | ||
1607 | 33 | |||
1608 | 34 | #DEBHELPER# | ||
1609 | 35 | exit 0 | ||
1610 | 0 | 36 | ||
1611 | === added file 'debian/maas-dns.postrm' | |||
1612 | --- debian/maas-dns.postrm 1970-01-01 00:00:00 +0000 | |||
1613 | +++ debian/maas-dns.postrm 2012-11-13 12:12:21 +0000 | |||
1614 | @@ -0,0 +1,24 @@ | |||
1615 | 1 | #!/bin/sh -e | ||
1616 | 2 | |||
1617 | 3 | if [ "$1" = "remove" ]; then | ||
1618 | 4 | if [ -f /etc/bind/named.conf.local ]; then | ||
1619 | 5 | sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.maas\"\;$/d' \ | ||
1620 | 6 | /etc/bind/named.conf.local | ||
1621 | 7 | fi | ||
1622 | 8 | fi | ||
1623 | 9 | |||
1624 | 10 | if [ "$1" = "purge" ]; then | ||
1625 | 11 | # Remove zone files | ||
1626 | 12 | if [ -d /etc/bind/maas ]; then | ||
1627 | 13 | rm -rf /etc/bind/maas | ||
1628 | 14 | fi | ||
1629 | 15 | fi | ||
1630 | 16 | |||
1631 | 17 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
1632 | 18 | invoke-rc.d bind9 restart || true | ||
1633 | 19 | fi | ||
1634 | 20 | |||
1635 | 21 | #DEBHELPER# | ||
1636 | 22 | |||
1637 | 23 | exit 0 | ||
1638 | 24 | |||
1639 | 0 | 25 | ||
1640 | === added file 'debian/maas-region-controller.apport' | |||
1641 | --- debian/maas-region-controller.apport 1970-01-01 00:00:00 +0000 | |||
1642 | +++ debian/maas-region-controller.apport 2012-11-13 12:12:21 +0000 | |||
1643 | @@ -0,0 +1,37 @@ | |||
1644 | 1 | #!/usr/bin/python | ||
1645 | 2 | |||
1646 | 3 | '''apport hook for bind9 | ||
1647 | 4 | |||
1648 | 5 | (c) 2012 Canonical Ltd. | ||
1649 | 6 | Author: Andres Rodriguez <andres.rodriguez@canonical.com> | ||
1650 | 7 | |||
1651 | 8 | This program is free software; you can redistribute it and/or modify it | ||
1652 | 9 | under the terms of the GNU General Public License as published by the | ||
1653 | 10 | Free Software Foundation; either version 2 of the License, or (at your | ||
1654 | 11 | option) any later version. See http://www.gnu.org/copyleft/gpl.html for | ||
1655 | 12 | the full text of the license. | ||
1656 | 13 | ''' | ||
1657 | 14 | |||
1658 | 15 | from apport.hookutils import * | ||
1659 | 16 | |||
1660 | 17 | def add_info(report, ui): | ||
1661 | 18 | response = ui.yesno("The contents of your /etc/maas/maas_local_settings.py, " | ||
1662 | 19 | "/etc/maas/txlongpoll.yaml, /etc/maas/pserv.yaml files " | ||
1663 | 20 | "may help developers diagnose your bug more " | ||
1664 | 21 | "quickly. However, it may contain sensitive " | ||
1665 | 22 | "information. Do you want to include it in your " | ||
1666 | 23 | "bug report?") | ||
1667 | 24 | |||
1668 | 25 | if response == None: # user cancelled | ||
1669 | 26 | raise StopIteration | ||
1670 | 27 | |||
1671 | 28 | elif response == True: | ||
1672 | 29 | attach_conffiles(report,'maas') | ||
1673 | 30 | |||
1674 | 31 | # Attaching log files | ||
1675 | 32 | attach_file_if_exists(report, '/var/log/maas/maas.log', 'MAASLog') | ||
1676 | 33 | attach_file_if_exists(report, '/var/log/maas/pserv.log', 'MAASPservLog') | ||
1677 | 34 | attach_file_if_exists(report, '/var/log/maas/txlongpoll.log', 'MAAStxlongpollLog') | ||
1678 | 35 | |||
1679 | 36 | # Attaching related packages info | ||
1680 | 37 | attach_related_packages(report, ['python-django-maas', 'apparmor']) | ||
1681 | 0 | 38 | ||
1682 | === added file 'debian/maas-region-controller.config' | |||
1683 | --- debian/maas-region-controller.config 1970-01-01 00:00:00 +0000 | |||
1684 | +++ debian/maas-region-controller.config 2012-11-13 12:12:21 +0000 | |||
1685 | @@ -0,0 +1,45 @@ | |||
1686 | 1 | #!/bin/sh -e | ||
1687 | 2 | |||
1688 | 3 | . /usr/share/debconf/confmodule | ||
1689 | 4 | db_version 2.0 | ||
1690 | 5 | |||
1691 | 6 | # creates question | ||
1692 | 7 | set_question() { | ||
1693 | 8 | if ! db_fget "$1" seen; then | ||
1694 | 9 | db_register dbconfig-common/dbconfig-install "$1" | ||
1695 | 10 | db_subst "$1" ID "$1" | ||
1696 | 11 | db_fget "$1" seen | ||
1697 | 12 | fi | ||
1698 | 13 | if [ "$RET" = false ]; then | ||
1699 | 14 | db_set "$1" "$2" | ||
1700 | 15 | db_fset "$1" seen true | ||
1701 | 16 | fi | ||
1702 | 17 | } | ||
1703 | 18 | |||
1704 | 19 | # source dbconfig-common shell library, and call the hook function | ||
1705 | 20 | if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then | ||
1706 | 21 | . /usr/share/dbconfig-common/dpkg/config.pgsql | ||
1707 | 22 | fi | ||
1708 | 23 | |||
1709 | 24 | if ([ "$1" = "configure" ] && [ -z "$2" ]); then | ||
1710 | 25 | # Hide maas/dbconfig-install question by setting default. | ||
1711 | 26 | set_question maas-region-controller/dbconfig-install true | ||
1712 | 27 | set_question maas-region-controller/pgsql/app-pass "" | ||
1713 | 28 | |||
1714 | 29 | dbc_dbname="maasdb" | ||
1715 | 30 | dbc_dbuser="maas" | ||
1716 | 31 | dbc_remove="true" | ||
1717 | 32 | |||
1718 | 33 | dbc_go maas-region-controller $@ | ||
1719 | 34 | |||
1720 | 35 | elif [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then | ||
1721 | 36 | db_get maas/default-maas-url || true | ||
1722 | 37 | if [ -n "$RET" ]; then | ||
1723 | 38 | db_set maas/default-maas-url "$RET" | ||
1724 | 39 | else | ||
1725 | 40 | ipaddr=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"/")} END{print array[3] }' /etc/maas/maas_local_settings.py) | ||
1726 | 41 | db_set maas/default-maas-url "$ipaddr" | ||
1727 | 42 | fi | ||
1728 | 43 | db_input low maas/default-maas-url || true | ||
1729 | 44 | db_go | ||
1730 | 45 | fi | ||
1731 | 0 | 46 | ||
1732 | === added file 'debian/maas-region-controller.dirs' | |||
1733 | --- debian/maas-region-controller.dirs 1970-01-01 00:00:00 +0000 | |||
1734 | +++ debian/maas-region-controller.dirs 2012-11-13 12:12:21 +0000 | |||
1735 | @@ -0,0 +1,2 @@ | |||
1736 | 1 | var/log/maas/oops | ||
1737 | 2 | var/lib/maas/tftp | ||
1738 | 0 | 3 | ||
1739 | === added file 'debian/maas-region-controller.install' | |||
1740 | --- debian/maas-region-controller.install 1970-01-01 00:00:00 +0000 | |||
1741 | +++ debian/maas-region-controller.install 2012-11-13 12:12:21 +0000 | |||
1742 | @@ -0,0 +1,33 @@ | |||
1743 | 1 | # Install project | ||
1744 | 2 | debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas | ||
1745 | 3 | |||
1746 | 4 | # Install static files | ||
1747 | 5 | debian/tmp/usr/share/maas/web/static | ||
1748 | 6 | |||
1749 | 7 | # Install Apache Config | ||
1750 | 8 | debian/tmp/etc/maas/maas-http.conf | ||
1751 | 9 | |||
1752 | 10 | # Install MAAS local settings | ||
1753 | 11 | debian/tmp/etc/maas/maas_local_settings.py | ||
1754 | 12 | |||
1755 | 13 | # Install celery config file | ||
1756 | 14 | debian/tmp/usr/share/maas/celeryconfig.py | ||
1757 | 15 | |||
1758 | 16 | # Install local celery region config file | ||
1759 | 17 | debian/tmp/etc/maas/maas_local_celeryconfig.py | ||
1760 | 18 | |||
1761 | 19 | # Install WSGI | ||
1762 | 20 | debian/tmp/usr/share/maas/wsgi.py | ||
1763 | 21 | |||
1764 | 22 | # Install txlongpoll config file | ||
1765 | 23 | debian/tmp/etc/maas/txlongpoll.yaml | ||
1766 | 24 | |||
1767 | 25 | # Install new preseed files | ||
1768 | 26 | debian/tmp/usr/share/maas/preseeds | ||
1769 | 27 | |||
1770 | 28 | # Install all other stuff | ||
1771 | 29 | debian/extras/maas usr/sbin | ||
1772 | 30 | debian/extras/maas-region-celeryd usr/sbin | ||
1773 | 31 | debian/extras/20-maas.conf etc/rsyslog.d | ||
1774 | 32 | debian/extras/maas_remote_syslog_compress etc/cron.d | ||
1775 | 33 | debian/extras/99-maas usr/share/maas/conf | ||
1776 | 0 | 34 | ||
1777 | === added file 'debian/maas-region-controller.links' | |||
1778 | --- debian/maas-region-controller.links 1970-01-01 00:00:00 +0000 | |||
1779 | +++ debian/maas-region-controller.links 2012-11-13 12:12:21 +0000 | |||
1780 | @@ -0,0 +1,2 @@ | |||
1781 | 1 | etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py | ||
1782 | 2 | etc/maas/maas_local_celeryconfig.py usr/share/maas/maas_local_celeryconfig.py | ||
1783 | 0 | 3 | ||
1784 | === added file 'debian/maas-region-controller.lintian-overrides' | |||
1785 | --- debian/maas-region-controller.lintian-overrides 1970-01-01 00:00:00 +0000 | |||
1786 | +++ debian/maas-region-controller.lintian-overrides 2012-11-13 12:12:21 +0000 | |||
1787 | @@ -0,0 +1,7 @@ | |||
1788 | 1 | maas-region-controller: embedded-javascript-library usr/share/maas/web/static/jslibs/yui/3.4.1/build/yui/yui-min.js | ||
1789 | 2 | maas-region-controller: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/panel/vendor/prettify/COPYING | ||
1790 | 3 | maas-region-controller: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/vendor/prettify/COPYING | ||
1791 | 4 | maas-region-controller: script-not-executable usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js | ||
1792 | 5 | maas-region-controller: unusual-interpreter usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js #!node | ||
1793 | 6 | maas-region-controller: postinst-uses-db-input | ||
1794 | 7 | maas-region-controller: binary-without-manpage usr/bin/maas | ||
1795 | 0 | 8 | ||
1796 | === added file 'debian/maas-region-controller.logrotate' | |||
1797 | --- debian/maas-region-controller.logrotate 1970-01-01 00:00:00 +0000 | |||
1798 | +++ debian/maas-region-controller.logrotate 2012-11-13 12:12:21 +0000 | |||
1799 | @@ -0,0 +1,18 @@ | |||
1800 | 1 | /var/log/maas/maas.log { | ||
1801 | 2 | rotate 5 | ||
1802 | 3 | weekly | ||
1803 | 4 | compress | ||
1804 | 5 | copytruncate | ||
1805 | 6 | missingok | ||
1806 | 7 | #create 620 root www-data | ||
1807 | 8 | } | ||
1808 | 9 | |||
1809 | 10 | /var/log/maas/txlongpoll.log { | ||
1810 | 11 | rotate 5 | ||
1811 | 12 | weekly | ||
1812 | 13 | compress | ||
1813 | 14 | missingok | ||
1814 | 15 | postrotate | ||
1815 | 16 | [ -r /var/run/maas-txlongpoll.pid ] && kill -s USR2 $(cat /var/run/maas-txlongpoll.pid) || true | ||
1816 | 17 | endscript | ||
1817 | 18 | } | ||
1818 | 0 | 19 | ||
1819 | === added file 'debian/maas-region-controller.maas-region-celery.upstart' | |||
1820 | --- debian/maas-region-controller.maas-region-celery.upstart 1970-01-01 00:00:00 +0000 | |||
1821 | +++ debian/maas-region-controller.maas-region-celery.upstart 2012-11-13 12:12:21 +0000 | |||
1822 | @@ -0,0 +1,26 @@ | |||
1823 | 1 | # maas-celery - celery daemon for the region controller | ||
1824 | 2 | # | ||
1825 | 3 | # MAAS Region Controller Celery Daemon | ||
1826 | 4 | |||
1827 | 5 | description "MAAS" | ||
1828 | 6 | author "Raphael Badin <raphael.badin@canonical.com>" | ||
1829 | 7 | |||
1830 | 8 | start on filesystem and net-device-up and rabbitmq-server-running | ||
1831 | 9 | stop on runlevel [016] | ||
1832 | 10 | |||
1833 | 11 | respawn | ||
1834 | 12 | |||
1835 | 13 | env workers_user="maas_workers" | ||
1836 | 14 | env workers_pass="" | ||
1837 | 15 | env workers_vhost="/maas_workers" | ||
1838 | 16 | |||
1839 | 17 | pre-start script | ||
1840 | 18 | if ! /usr/sbin/rabbitmqctl list_user_permissions $workers_user 1>/dev/null 2>&1; then | ||
1841 | 19 | workers_pass=`grep "maas_workers" /etc/maas/maas_local_celeryconfig.py | cut -d':' -f3 | cut -d'@' -f1` | ||
1842 | 20 | /usr/sbin/rabbitmqctl add_user "$workers_user" "$workers_pass" | ||
1843 | 21 | /usr/sbin/rabbitmqctl add_vhost "$workers_vhost" | ||
1844 | 22 | /usr/sbin/rabbitmqctl set_permissions -p "$workers_vhost" "$workers_user" ".*" ".*" ".*" | ||
1845 | 23 | fi | ||
1846 | 24 | end script | ||
1847 | 25 | |||
1848 | 26 | exec /usr/sbin/maas-region-celeryd --logfile=/var/log/maas/celery-region.log --schedule=/var/lib/maas/celerybeat-region-schedule --user=maas --group=maas | ||
1849 | 0 | 27 | ||
1850 | === added file 'debian/maas-region-controller.maas-txlongpoll.upstart' | |||
1851 | --- debian/maas-region-controller.maas-txlongpoll.upstart 1970-01-01 00:00:00 +0000 | |||
1852 | +++ debian/maas-region-controller.maas-txlongpoll.upstart 2012-11-13 12:12:21 +0000 | |||
1853 | @@ -0,0 +1,27 @@ | |||
1854 | 1 | # maas - txlongpoll service | ||
1855 | 2 | # | ||
1856 | 3 | # MAAS Provisioning Service txlongpoll | ||
1857 | 4 | |||
1858 | 5 | description "MAAS txlongpoll" | ||
1859 | 6 | author "Andres Rodriguez <andres.rodriguez@canonical.com>" | ||
1860 | 7 | |||
1861 | 8 | start on filesystem and net-device-up and rabbitmq-server-running | ||
1862 | 9 | stop on runlevel [016] | ||
1863 | 10 | |||
1864 | 11 | respawn | ||
1865 | 12 | |||
1866 | 13 | env longpoll_user="maas_longpoll" | ||
1867 | 14 | env longpoll_pass="" | ||
1868 | 15 | env longpoll_vhost="/maas_longpoll" | ||
1869 | 16 | |||
1870 | 17 | pre-start script | ||
1871 | 18 | if ! /usr/sbin/rabbitmqctl list_user_permissions $longpoll_user 1>/dev/null 2>&1; then | ||
1872 | 19 | longpoll_pass=`/bin/grep "password" /etc/maas/txlongpoll.yaml | cut -d'"' -f2` | ||
1873 | 20 | /usr/sbin/rabbitmqctl add_user "$longpoll_user" "$longpoll_pass" | ||
1874 | 21 | /usr/sbin/rabbitmqctl add_vhost "$longpoll_vhost" | ||
1875 | 22 | /usr/sbin/rabbitmqctl set_permissions -p "$longpoll_vhost" "$longpoll_user" ".*" ".*" ".*" | ||
1876 | 23 | fi | ||
1877 | 24 | end script | ||
1878 | 25 | |||
1879 | 26 | # To add options to your daemon, edit the line below: | ||
1880 | 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 | ||
1881 | 0 | 28 | ||
1882 | === added file 'debian/maas-region-controller.postinst' | |||
1883 | --- debian/maas-region-controller.postinst 1970-01-01 00:00:00 +0000 | |||
1884 | +++ debian/maas-region-controller.postinst 2012-11-13 12:12:21 +0000 | |||
1885 | @@ -0,0 +1,295 @@ | |||
1886 | 1 | #!/bin/sh -e | ||
1887 | 2 | |||
1888 | 3 | . /usr/share/debconf/confmodule | ||
1889 | 4 | db_version 2.0 | ||
1890 | 5 | |||
1891 | 6 | if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then | ||
1892 | 7 | . /usr/share/dbconfig-common/dpkg/postinst.pgsql | ||
1893 | 8 | fi | ||
1894 | 9 | |||
1895 | 10 | maas_sync_migrate_db(){ | ||
1896 | 11 | maas syncdb --noinput | ||
1897 | 12 | maas migrate maasserver --noinput | ||
1898 | 13 | maas migrate metadataserver --noinput | ||
1899 | 14 | } | ||
1900 | 15 | |||
1901 | 16 | restart_apache2(){ | ||
1902 | 17 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
1903 | 18 | invoke-rc.d apache2 restart || true | ||
1904 | 19 | else | ||
1905 | 20 | /etc/init.d/apache2 restart || true | ||
1906 | 21 | fi | ||
1907 | 22 | } | ||
1908 | 23 | |||
1909 | 24 | restart_rabbitmq(){ | ||
1910 | 25 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
1911 | 26 | invoke-rc.d rabbitmq-server restart || true | ||
1912 | 27 | else | ||
1913 | 28 | /etc/init.d/rabbitmq-server restart || true | ||
1914 | 29 | fi | ||
1915 | 30 | } | ||
1916 | 31 | |||
1917 | 32 | restart_postgresql(){ | ||
1918 | 33 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
1919 | 34 | invoke-rc.d --force postgresql restart || true | ||
1920 | 35 | else | ||
1921 | 36 | /etc/init.d/postgresql restart || true | ||
1922 | 37 | fi | ||
1923 | 38 | } | ||
1924 | 39 | |||
1925 | 40 | restart_squid_deb_proxy() { | ||
1926 | 41 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
1927 | 42 | invoke-rc.d squid-deb-proxy restart || true | ||
1928 | 43 | else | ||
1929 | 44 | /etc/init.d/squid-deb-proxy restart || true | ||
1930 | 45 | fi | ||
1931 | 46 | } | ||
1932 | 47 | |||
1933 | 48 | configure_maas_txlongpoll_rabbitmq_user() { | ||
1934 | 49 | local longpoll_user="maas_longpoll" | ||
1935 | 50 | local longpoll_pass= | ||
1936 | 51 | local longpoll_vhost="/maas_longpoll" | ||
1937 | 52 | longpoll_pass="$(pwgen -s 20)" | ||
1938 | 53 | if [ -x /usr/sbin/rabbitmqctl ]; then | ||
1939 | 54 | if ! rabbitmqctl list_users | grep -qs "$longpoll_user"; then | ||
1940 | 55 | rabbitmqctl add_user "$longpoll_user" "$longpoll_pass" || true | ||
1941 | 56 | rabbitmqctl add_vhost "$longpoll_vhost" || true | ||
1942 | 57 | rabbitmqctl set_permissions -p "$longpoll_vhost" "$longpoll_user" ".*" ".*" ".*" || true | ||
1943 | 58 | else | ||
1944 | 59 | rabbitmqctl change_password "$longpoll_user" "$longpoll_pass" || true | ||
1945 | 60 | fi | ||
1946 | 61 | fi | ||
1947 | 62 | |||
1948 | 63 | if grep -qs "^\ \{1,\}password: \"[a-zA-Z0-9]\{0,\}\"$" /etc/maas/txlongpoll.yaml; then | ||
1949 | 64 | sed -i "s/^\ \{1,\}password: \"[a-zA-Z0-9]\{0,\}\"$/ password: \""$longpoll_pass"\"/" \ | ||
1950 | 65 | /etc/maas/txlongpoll.yaml | ||
1951 | 66 | fi | ||
1952 | 67 | if grep -qs "^RABBITMQ_PASSWORD\ \= '[a-zA-Z0-9]\{0,\}'$" /etc/maas/maas_local_settings.py; then | ||
1953 | 68 | sed -i "s/^RABBITMQ_PASSWORD\ \= '[a-zA-Z0-9]\{0,\}'$/RABBITMQ_PASSWORD = '"$longpoll_pass"'/" \ | ||
1954 | 69 | /etc/maas/maas_local_settings.py | ||
1955 | 70 | fi | ||
1956 | 71 | } | ||
1957 | 72 | |||
1958 | 73 | configure_maas_workers_rabbitmq_user() { | ||
1959 | 74 | local workers_user="maas_workers" | ||
1960 | 75 | local workers_pass="$(pwgen -s 20)" | ||
1961 | 76 | local workers_vhost="/maas_workers" | ||
1962 | 77 | local amqp_host="$1" | ||
1963 | 78 | if [ -z "$amqp_host" ]; then | ||
1964 | 79 | amqp_host="localhost" | ||
1965 | 80 | fi | ||
1966 | 81 | local amqp_port="5672" | ||
1967 | 82 | if [ -x /usr/sbin/rabbitmqctl ]; then | ||
1968 | 83 | if ! rabbitmqctl list_users | grep -qs "$workers_user"; then | ||
1969 | 84 | rabbitmqctl add_user "$workers_user" "$workers_pass" || true | ||
1970 | 85 | rabbitmqctl add_vhost "$workers_vhost" || true | ||
1971 | 86 | rabbitmqctl set_permissions -p "$workers_vhost" "$workers_user" ".*" ".*" ".*" || true | ||
1972 | 87 | else | ||
1973 | 88 | rabbitmqctl change_password "$workers_user" "$workers_pass" || true | ||
1974 | 89 | fi | ||
1975 | 90 | fi | ||
1976 | 91 | |||
1977 | 92 | if grep -qs "^BROKER_URL\ \= '.*'$" /etc/maas/maas_local_celeryconfig.py; then | ||
1978 | 93 | local broker_url="amqp://$workers_user:$workers_pass@$amqp_host:$amqp_port/$workers_vhost" | ||
1979 | 94 | sed -i "s|^BROKER_URL\ \= '.*'$|BROKER_URL = '"$broker_url"'|" \ | ||
1980 | 95 | /etc/maas/maas_local_celeryconfig.py | ||
1981 | 96 | fi | ||
1982 | 97 | } | ||
1983 | 98 | |||
1984 | 99 | configure_maas_database() { | ||
1985 | 100 | local dbc_dbpass="$1" | ||
1986 | 101 | if grep -qs "^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$" /etc/maas/maas_local_settings.py; then | ||
1987 | 102 | sed -i "s/^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$/ 'PASSWORD': '"$dbc_dbpass"',/" \ | ||
1988 | 103 | /etc/maas/maas_local_settings.py | ||
1989 | 104 | fi | ||
1990 | 105 | } | ||
1991 | 106 | |||
1992 | 107 | configure_maas_default_url() { | ||
1993 | 108 | local ipaddr="$1" | ||
1994 | 109 | |||
1995 | 110 | if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then | ||
1996 | 111 | sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/"$ipaddr"\/MAAS\"/" \ | ||
1997 | 112 | /etc/maas/maas_local_settings.py | ||
1998 | 113 | fi | ||
1999 | 114 | } | ||
2000 | 115 | |||
2001 | 116 | configure_maas_squid_deb_proxy() { | ||
2002 | 117 | local ipaddr="$1" | ||
2003 | 118 | |||
2004 | 119 | if [ -e /usr/share/maas/conf/99-maas -a \ | ||
2005 | 120 | ! -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then | ||
2006 | 121 | ln -sf /usr/share/maas/conf/99-maas \ | ||
2007 | 122 | /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas | ||
2008 | 123 | fi | ||
2009 | 124 | |||
2010 | 125 | sed -i "s/\(^[a-zA-Z0-9\.\-].*\) # maasurl$/$ipaddr # maasurl/" \ | ||
2011 | 126 | /usr/share/maas/conf/99-maas | ||
2012 | 127 | } | ||
2013 | 128 | |||
2014 | 129 | if [ "$1" = "configure" ] && [ -z "$2" ]; then | ||
2015 | 130 | ######################################################### | ||
2016 | 131 | ################ Folder Permissions #################### | ||
2017 | 132 | ######################################################### | ||
2018 | 133 | mkdir -p /var/lib/maas/media/storage | ||
2019 | 134 | chown -R maas:maas /var/lib/maas/ | ||
2020 | 135 | |||
2021 | 136 | # Config will contain credentials, so should be readable | ||
2022 | 137 | # by the application but nobody else. | ||
2023 | 138 | chown root:maas \ | ||
2024 | 139 | /etc/maas/maas_local_celeryconfig.py \ | ||
2025 | 140 | /etc/maas/maas_local_settings.py | ||
2026 | 141 | chmod 0640 \ | ||
2027 | 142 | /etc/maas/maas_local_celeryconfig.py \ | ||
2028 | 143 | /etc/maas/maas_local_settings.py | ||
2029 | 144 | |||
2030 | 145 | ######################################################### | ||
2031 | 146 | ################ Configure Apache2 #################### | ||
2032 | 147 | ######################################################### | ||
2033 | 148 | # handle apache configs | ||
2034 | 149 | if [ -e /etc/maas/maas-http.conf -a \ | ||
2035 | 150 | ! -e /etc/apache2/conf.d/maas-http.conf ]; then | ||
2036 | 151 | ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf | ||
2037 | 152 | fi | ||
2038 | 153 | |||
2039 | 154 | # enable apache modules needed | ||
2040 | 155 | a2enmod proxy_http | ||
2041 | 156 | a2enmod expires | ||
2042 | 157 | a2enmod wsgi | ||
2043 | 158 | |||
2044 | 159 | ######################################################### | ||
2045 | 160 | ########## Configure DEFAULT_MAAS_URL ################# | ||
2046 | 161 | ######################################################### | ||
2047 | 162 | |||
2048 | 163 | # Obtain IP address of default route and change DEFAULT_MAAS_URL. | ||
2049 | 164 | while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do | ||
2050 | 165 | [ "$Mask" = "00000000" ] && break | ||
2051 | 166 | done < /proc/net/route | ||
2052 | 167 | interface="$Iface" | ||
2053 | 168 | ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global) | ||
2054 | 169 | ipaddr=${ipaddr#* inet } | ||
2055 | 170 | ipaddr=${ipaddr%%/*} | ||
2056 | 171 | # Set the IP address of the interface with default route | ||
2057 | 172 | if [ -n "$ipaddr" ]; then | ||
2058 | 173 | configure_maas_default_url "$ipaddr" | ||
2059 | 174 | configure_maas_squid_deb_proxy "$ipaddr" | ||
2060 | 175 | db_subst maas/installation-note MAAS_URL "$ipaddr" | ||
2061 | 176 | db_set maas/default-maas-url "$ipaddr" | ||
2062 | 177 | fi | ||
2063 | 178 | |||
2064 | 179 | ######################################################### | ||
2065 | 180 | ################ Configure Logging #################### | ||
2066 | 181 | ######################################################### | ||
2067 | 182 | |||
2068 | 183 | # Give appropriate permissions | ||
2069 | 184 | if [ ! -f /var/log/maas/maas.log ]; then | ||
2070 | 185 | touch /var/log/maas/maas.log | ||
2071 | 186 | fi | ||
2072 | 187 | chown -R maas:maas /var/log/maas | ||
2073 | 188 | chmod -R 775 /var/log/maas/oops | ||
2074 | 189 | |||
2075 | 190 | # Create log directory base | ||
2076 | 191 | mkdir -p /var/log/maas/rsyslog | ||
2077 | 192 | chown -R syslog:syslog /var/log/maas/rsyslog | ||
2078 | 193 | # Make sure rsyslog reads our config | ||
2079 | 194 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
2080 | 195 | invoke-rc.d rsyslog restart | ||
2081 | 196 | fi | ||
2082 | 197 | |||
2083 | 198 | ######################################################### | ||
2084 | 199 | ################### Squid-deb-proxy #################### | ||
2085 | 200 | ######################################################### | ||
2086 | 201 | # Make sure squid-deb-proxy reads our config (99-maas) | ||
2087 | 202 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
2088 | 203 | invoke-rc.d squid-deb-proxy restart | ||
2089 | 204 | fi | ||
2090 | 205 | |||
2091 | 206 | ######################################################### | ||
2092 | 207 | ########## Configure longpoll rabbitmq config ########### | ||
2093 | 208 | ######################################################### | ||
2094 | 209 | |||
2095 | 210 | # Handle longpoll/rabbitmq publishing | ||
2096 | 211 | restart_rabbitmq | ||
2097 | 212 | configure_maas_txlongpoll_rabbitmq_user | ||
2098 | 213 | |||
2099 | 214 | ######################################################### | ||
2100 | 215 | ########## Configure worker rabbitmq config ########### | ||
2101 | 216 | ######################################################### | ||
2102 | 217 | |||
2103 | 218 | # Handle celery/rabbitmq publishing | ||
2104 | 219 | configure_maas_workers_rabbitmq_user "$ipaddr" | ||
2105 | 220 | |||
2106 | 221 | ######################################################### | ||
2107 | 222 | ################ Configure Database ################### | ||
2108 | 223 | ######################################################### | ||
2109 | 224 | |||
2110 | 225 | # Need to for postgresql start so it doesn't fail on the installer | ||
2111 | 226 | restart_postgresql | ||
2112 | 227 | |||
2113 | 228 | # Create the database | ||
2114 | 229 | dbc_go maas-region-controller $@ | ||
2115 | 230 | configure_maas_database "$dbc_dbpass" | ||
2116 | 231 | |||
2117 | 232 | # Only syncdb if we have selected to install it with dbconfig-common. | ||
2118 | 233 | db_get maas-region-controller/dbconfig-install | ||
2119 | 234 | if [ "$RET" = "true" ]; then | ||
2120 | 235 | maas_sync_migrate_db | ||
2121 | 236 | fi | ||
2122 | 237 | |||
2123 | 238 | # Display installation note | ||
2124 | 239 | db_input high maas/installation-note || true | ||
2125 | 240 | db_go | ||
2126 | 241 | |||
2127 | 242 | elif [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then | ||
2128 | 243 | # Set the IP address of the interface with default route | ||
2129 | 244 | db_get maas/default-maas-url | ||
2130 | 245 | ipaddr="$RET" | ||
2131 | 246 | db_set maas/default-maas-url "$ipaddr" | ||
2132 | 247 | if [ -n "$ipaddr" ]; then | ||
2133 | 248 | configure_maas_default_url "$ipaddr" | ||
2134 | 249 | configure_maas_squid_deb_proxy "$ipaddr" | ||
2135 | 250 | configure_maas_workers_rabbitmq_user "$ipaddr" | ||
2136 | 251 | fi | ||
2137 | 252 | |||
2138 | 253 | elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then | ||
2139 | 254 | # If upgrading to any later package version, then upgrade db. | ||
2140 | 255 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
2141 | 256 | invoke-rc.d apache2 stop || true | ||
2142 | 257 | fi | ||
2143 | 258 | |||
2144 | 259 | # make sure postgresql is running | ||
2145 | 260 | restart_postgresql | ||
2146 | 261 | |||
2147 | 262 | # we need to regenerate the passwords and update configs. | ||
2148 | 263 | db_get maas/default-maas-url | ||
2149 | 264 | ipaddr="$RET" | ||
2150 | 265 | configure_maas_default_url "$ipaddr" | ||
2151 | 266 | configure_maas_squid_deb_proxy "$ipaddr" | ||
2152 | 267 | # make sure rabbitmq is running | ||
2153 | 268 | restart_rabbitmq | ||
2154 | 269 | configure_maas_txlongpoll_rabbitmq_user | ||
2155 | 270 | # Handle celery/rabbitmq publishing | ||
2156 | 271 | configure_maas_workers_rabbitmq_user "$ipaddr" | ||
2157 | 272 | # handle database upgrade | ||
2158 | 273 | if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then | ||
2159 | 274 | # source dbconfig-common db config for maas-region-controller | ||
2160 | 275 | # before upgrading database, otherwise a new config is written | ||
2161 | 276 | # but the password is no longer preserved. | ||
2162 | 277 | . /etc/dbconfig-common/maas-region-controller.conf | ||
2163 | 278 | else | ||
2164 | 279 | dbc_go maas-region-controller $@ | ||
2165 | 280 | fi | ||
2166 | 281 | configure_maas_database "$dbc_dbpass" | ||
2167 | 282 | |||
2168 | 283 | maas_sync_migrate_db | ||
2169 | 284 | |||
2170 | 285 | fi | ||
2171 | 286 | |||
2172 | 287 | restart_apache2 | ||
2173 | 288 | |||
2174 | 289 | restart_squid_deb_proxy | ||
2175 | 290 | |||
2176 | 291 | db_stop | ||
2177 | 292 | |||
2178 | 293 | #DEBHELPER# | ||
2179 | 294 | |||
2180 | 295 | exit 0 | ||
2181 | 0 | 296 | ||
2182 | === added file 'debian/maas-region-controller.postrm' | |||
2183 | --- debian/maas-region-controller.postrm 1970-01-01 00:00:00 +0000 | |||
2184 | +++ debian/maas-region-controller.postrm 2012-11-13 12:12:21 +0000 | |||
2185 | @@ -0,0 +1,52 @@ | |||
2186 | 1 | #!/bin/sh | ||
2187 | 2 | |||
2188 | 3 | set -e | ||
2189 | 4 | |||
2190 | 5 | . /usr/share/debconf/confmodule | ||
2191 | 6 | |||
2192 | 7 | if [ -f /etc/dbconfig-common/maas.conf ]; then | ||
2193 | 8 | if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then | ||
2194 | 9 | . /usr/share/dbconfig-common/dpkg/postrm.pgsql | ||
2195 | 10 | dbc_go maas-region-controller $@ | ||
2196 | 11 | fi | ||
2197 | 12 | fi | ||
2198 | 13 | |||
2199 | 14 | case "$1" in | ||
2200 | 15 | purge) | ||
2201 | 16 | rm -rf /var/log/maas | ||
2202 | 17 | rm -rf /var/lib/maas | ||
2203 | 18 | if [ -h /etc/apache2/conf.d/maas-http.conf ]; then | ||
2204 | 19 | rm -rf /etc/apache2/conf.d/maas-http.conf | ||
2205 | 20 | fi | ||
2206 | 21 | |||
2207 | 22 | # Restarting apache2 | ||
2208 | 23 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
2209 | 24 | invoke-rc.d apache2 restart || true | ||
2210 | 25 | else | ||
2211 | 26 | /etc/init.d/apache2 restart || true | ||
2212 | 27 | fi | ||
2213 | 28 | |||
2214 | 29 | # Delete symlink | ||
2215 | 30 | if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then | ||
2216 | 31 | rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas | ||
2217 | 32 | fi | ||
2218 | 33 | |||
2219 | 34 | # Remove rabbitmq/longpoll/celery | ||
2220 | 35 | longpoll_user="maas_longpoll" | ||
2221 | 36 | longpoll_vhost="/maas_longpoll" | ||
2222 | 37 | workers_user="maas_workers" | ||
2223 | 38 | workers_vhost="/maas_workers" | ||
2224 | 39 | if [ -x /usr/sbin/rabbitmqctl ]; then | ||
2225 | 40 | rabbitmqctl delete_vhost "$longpoll_vhost" || true | ||
2226 | 41 | rabbitmqctl delete_user "$longpoll_user" || true | ||
2227 | 42 | |||
2228 | 43 | rabbitmqctl delete_vhost "$workers_vhost" || true | ||
2229 | 44 | rabbitmqctl delete_user "$workers_user" || true | ||
2230 | 45 | fi | ||
2231 | 46 | esac | ||
2232 | 47 | |||
2233 | 48 | #DEBHELPER# | ||
2234 | 49 | |||
2235 | 50 | db_stop | ||
2236 | 51 | |||
2237 | 52 | exit 0 | ||
2238 | 0 | 53 | ||
2239 | === added file 'debian/maas-region-controller.prerm' | |||
2240 | --- debian/maas-region-controller.prerm 1970-01-01 00:00:00 +0000 | |||
2241 | +++ debian/maas-region-controller.prerm 2012-11-13 12:12:21 +0000 | |||
2242 | @@ -0,0 +1,18 @@ | |||
2243 | 1 | #!/bin/sh | ||
2244 | 2 | |||
2245 | 3 | set -e | ||
2246 | 4 | |||
2247 | 5 | . /usr/share/debconf/confmodule | ||
2248 | 6 | |||
2249 | 7 | #DEBHELPER# | ||
2250 | 8 | |||
2251 | 9 | if [ -x /usr/sbin/invoke-rc.d ]; then | ||
2252 | 10 | invoke-rc.d apache2 stop || true | ||
2253 | 11 | else | ||
2254 | 12 | /etc/init.d/apache2 stop || true | ||
2255 | 13 | fi | ||
2256 | 14 | |||
2257 | 15 | . /usr/share/dbconfig-common/dpkg/prerm.pgsql | ||
2258 | 16 | dbc_go maas-region-controller $@ | ||
2259 | 17 | |||
2260 | 18 | exit 0 | ||
2261 | 0 | 19 | ||
2262 | === added file 'debian/maas-region-controller.templates' | |||
2263 | --- debian/maas-region-controller.templates 1970-01-01 00:00:00 +0000 | |||
2264 | +++ debian/maas-region-controller.templates 2012-11-13 12:12:21 +0000 | |||
2265 | @@ -0,0 +1,22 @@ | |||
2266 | 1 | Template: maas/installation-note | ||
2267 | 2 | Type: note | ||
2268 | 3 | Default: true | ||
2269 | 4 | _Description: Ubuntu MAAS Server | ||
2270 | 5 | The Ubuntu MAAS Server has been installed in your system. You | ||
2271 | 6 | can access the MAAS Web interface here: | ||
2272 | 7 | . | ||
2273 | 8 | http://${MAAS_URL}/MAAS | ||
2274 | 9 | . | ||
2275 | 10 | If the automatically detected address above is not in the same | ||
2276 | 11 | network as the MAAS clients, you need to reconfigure it: | ||
2277 | 12 | . | ||
2278 | 13 | sudo dpkg-reconfigure maas-region-controller | ||
2279 | 14 | |||
2280 | 15 | Template: maas/default-maas-url | ||
2281 | 16 | Type: string | ||
2282 | 17 | _Description: Ubuntu MAAS PXE/Provisioning network address: | ||
2283 | 18 | The Ubuntu MAAS Server automatically detects the IP address | ||
2284 | 19 | that is used for PXE and provisioning. However, it needs to be | ||
2285 | 20 | in the same network as the clients. If the automatically | ||
2286 | 21 | detected address is not in the same network as the clients, it | ||
2287 | 22 | must be changed. | ||
2288 | 0 | 23 | ||
2289 | === added file 'debian/maintscript' | |||
2290 | --- debian/maintscript 1970-01-01 00:00:00 +0000 | |||
2291 | +++ debian/maintscript 2012-11-13 12:12:21 +0000 | |||
2292 | @@ -0,0 +1,2 @@ | |||
2293 | 1 | rm_conffile /etc/init/maas-celery.conf 0.1+bzr971+dfsg-0ubuntu2 | ||
2294 | 2 | rm_conffile /etc/dbconfig-common/maas.conf 0.1+bzr971+dfsg-0ubuntu2 | ||
2295 | 0 | 3 | ||
2296 | === added directory 'debian/patches' | |||
2297 | === added file 'debian/patches/01-fix-database-settings.patch' | |||
2298 | --- debian/patches/01-fix-database-settings.patch 1970-01-01 00:00:00 +0000 | |||
2299 | +++ debian/patches/01-fix-database-settings.patch 2012-11-13 12:12:21 +0000 | |||
2300 | @@ -0,0 +1,26 @@ | |||
2301 | 1 | Index: maas-0.1+bzr702+dfsg.orig/contrib/maas_local_settings.py | ||
2302 | 2 | =================================================================== | ||
2303 | 3 | --- maas-0.1+bzr702+dfsg.orig.orig/contrib/maas_local_settings.py 2012-06-29 12:03:20.000000000 -0400 | ||
2304 | 4 | +++ maas-0.1+bzr702+dfsg.orig/contrib/maas_local_settings.py 2012-06-29 12:17:00.733389757 -0400 | ||
2305 | 5 | @@ -7,7 +7,7 @@ | ||
2306 | 6 | DEFAULT_MAAS_URL = "http://maas.internal.example.com/" | ||
2307 | 7 | |||
2308 | 8 | # Absolute path to the directory static files should be collected to. | ||
2309 | 9 | -STATIC_ROOT = '/var/lib/maas/static/' | ||
2310 | 10 | +STATIC_ROOT = '/usr/share/maas/web/static/' | ||
2311 | 11 | |||
2312 | 12 | # Prefix to use for MAAS's urls. | ||
2313 | 13 | # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with | ||
2314 | 14 | @@ -68,9 +68,9 @@ | ||
2315 | 15 | 'default': { | ||
2316 | 16 | # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc. | ||
2317 | 17 | 'ENGINE': 'django.db.backends.postgresql_psycopg2', | ||
2318 | 18 | - 'NAME': '', | ||
2319 | 19 | - 'USER': '', | ||
2320 | 20 | - 'PASSWORD': '', | ||
2321 | 21 | + 'NAME': 'maasdb', | ||
2322 | 22 | + 'USER': 'maas', | ||
2323 | 23 | + 'PASSWORD': 'maas', | ||
2324 | 24 | 'HOST': 'localhost', | ||
2325 | 25 | } | ||
2326 | 26 | } | ||
2327 | 0 | 27 | ||
2328 | === added file 'debian/patches/02-pserv-config.patch' | |||
2329 | --- debian/patches/02-pserv-config.patch 1970-01-01 00:00:00 +0000 | |||
2330 | +++ debian/patches/02-pserv-config.patch 2012-11-13 12:12:21 +0000 | |||
2331 | @@ -0,0 +1,38 @@ | |||
2332 | 1 | Description: Use default settings for MAAS PSERV | ||
2333 | 2 | Use default settings for MAAS pserv. These default settings | ||
2334 | 3 | include port, logfile, oops directory, cobbler url and username | ||
2335 | 4 | Author: Andres Rodriguez <andreserl@ubuntu.com> | ||
2336 | 5 | |||
2337 | 6 | Index: maas-0.1+bzr917+dfsg.orig/etc/pserv.yaml | ||
2338 | 7 | =================================================================== | ||
2339 | 8 | --- maas-0.1+bzr917+dfsg.orig.orig/etc/pserv.yaml 2012-08-23 16:22:46.483599114 -0400 | ||
2340 | 9 | +++ maas-0.1+bzr917+dfsg.orig/etc/pserv.yaml 2012-08-23 16:22:56.579599373 -0400 | ||
2341 | 10 | @@ -6,7 +6,7 @@ | ||
2342 | 11 | ## running server. | ||
2343 | 12 | # | ||
2344 | 13 | # logfile: "pserv.log" | ||
2345 | 14 | -logfile: "/dev/null" | ||
2346 | 15 | +logfile: "/var/log/maas/pserv.log" | ||
2347 | 16 | |||
2348 | 17 | ## OOPS configuration (optional). | ||
2349 | 18 | # | ||
2350 | 19 | @@ -15,7 +15,7 @@ | ||
2351 | 20 | # or directories other than what the oops machinery creates there. | ||
2352 | 21 | # | ||
2353 | 22 | # directory: | ||
2354 | 23 | - directory: "logs/oops" | ||
2355 | 24 | + directory: "/var/log/maas/oops" | ||
2356 | 25 | # reporter: | ||
2357 | 26 | reporter: "maas-pserv" | ||
2358 | 27 | |||
2359 | 28 | @@ -33,10 +33,8 @@ | ||
2360 | 29 | tftp: | ||
2361 | 30 | # root: /var/lib/maas/tftp | ||
2362 | 31 | # port: 69 | ||
2363 | 32 | - port: 5244 | ||
2364 | 33 | ## The URL to be contacted to generate PXE configurations. | ||
2365 | 34 | # generator: http://localhost/MAAS/api/1.0/pxeconfig/ | ||
2366 | 35 | - generator: http://localhost:5243/api/1.0/pxeconfig/ | ||
2367 | 36 | |||
2368 | 37 | ## Boot configuration. | ||
2369 | 38 | boot: | ||
2370 | 0 | 39 | ||
2371 | === added file 'debian/patches/03-txlongpoll-config.patch' | |||
2372 | --- debian/patches/03-txlongpoll-config.patch 1970-01-01 00:00:00 +0000 | |||
2373 | +++ debian/patches/03-txlongpoll-config.patch 2012-11-13 12:12:21 +0000 | |||
2374 | @@ -0,0 +1,39 @@ | |||
2375 | 1 | Description: Use default settings for MAAS txlongpoll | ||
2376 | 2 | Use default settings for MAAS txlongpoll. These default settings | ||
2377 | 3 | include oops directory, Message broker configuration, logfile. | ||
2378 | 4 | Author: Andres Rodriguez <andreserl@ubuntu.com> | ||
2379 | 5 | |||
2380 | 6 | Index: maas-0.1+bzr398+dfsg.orig/etc/txlongpoll.yaml | ||
2381 | 7 | =================================================================== | ||
2382 | 8 | --- maas-0.1+bzr398+dfsg.orig.orig/etc/txlongpoll.yaml 2012-04-03 09:49:48.109427702 -0400 | ||
2383 | 9 | +++ maas-0.1+bzr398+dfsg.orig/etc/txlongpoll.yaml 2012-04-03 09:53:07.276282800 -0400 | ||
2384 | 10 | @@ -17,7 +17,7 @@ | ||
2385 | 11 | # or directories other than what the oops machinery creates there. | ||
2386 | 12 | # | ||
2387 | 13 | # directory: "" | ||
2388 | 14 | - directory: "logs/oops" | ||
2389 | 15 | + directory: "/var/log/maas/oops" | ||
2390 | 16 | ## The reporter used when generating OOPS reports. | ||
2391 | 17 | # reporter: "LONGPOLL" | ||
2392 | 18 | reporter: "maas-txlongpoll" | ||
2393 | 19 | @@ -25,14 +25,14 @@ | ||
2394 | 20 | ## Message broker configuration. | ||
2395 | 21 | # | ||
2396 | 22 | broker: | ||
2397 | 23 | - # host: "localhost" | ||
2398 | 24 | - # port: 5672 | ||
2399 | 25 | - # username: "guest" | ||
2400 | 26 | - # password: "guest" | ||
2401 | 27 | - # vhost: "/" | ||
2402 | 28 | + host: "localhost" | ||
2403 | 29 | + port: 5672 | ||
2404 | 30 | + username: "maas_longpoll" | ||
2405 | 31 | + password: "maaslongpoll" | ||
2406 | 32 | + vhost: "/maas_longpoll" | ||
2407 | 33 | |||
2408 | 34 | ## Where to log. This log can be rotated by sending SIGUSR1 to the | ||
2409 | 35 | ## running server. | ||
2410 | 36 | # | ||
2411 | 37 | # logfile: "txlongpoll.log" | ||
2412 | 38 | -logfile: "/dev/null" | ||
2413 | 39 | +logfile: "/var/log/maas/txlongpoll.log" | ||
2414 | 0 | 40 | ||
2415 | === added file 'debian/patches/series' | |||
2416 | --- debian/patches/series 1970-01-01 00:00:00 +0000 | |||
2417 | +++ debian/patches/series 2012-11-13 12:12:21 +0000 | |||
2418 | @@ -0,0 +1,3 @@ | |||
2419 | 1 | 01-fix-database-settings.patch | ||
2420 | 2 | 02-pserv-config.patch | ||
2421 | 3 | 03-txlongpoll-config.patch | ||
2422 | 0 | 4 | ||
2423 | === added directory 'debian/po' | |||
2424 | === added file 'debian/po/POTFILES.in' | |||
2425 | --- debian/po/POTFILES.in 1970-01-01 00:00:00 +0000 | |||
2426 | +++ debian/po/POTFILES.in 2012-11-13 12:12:21 +0000 | |||
2427 | @@ -0,0 +1,2 @@ | |||
2428 | 1 | [type: gettext/rfc822deb] maas-region-controller.templates | ||
2429 | 2 | [type: gettext/rfc822deb] maas-cluster-controller.templates | ||
2430 | 0 | 3 | ||
2431 | === added file 'debian/po/templates.pot' | |||
2432 | --- debian/po/templates.pot 1970-01-01 00:00:00 +0000 | |||
2433 | +++ debian/po/templates.pot 2012-11-13 12:12:21 +0000 | |||
2434 | @@ -0,0 +1,82 @@ | |||
2435 | 1 | # SOME DESCRIPTIVE TITLE. | ||
2436 | 2 | # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER | ||
2437 | 3 | # This file is distributed under the same license as the PACKAGE package. | ||
2438 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
2439 | 5 | # | ||
2440 | 6 | #, fuzzy | ||
2441 | 7 | msgid "" | ||
2442 | 8 | msgstr "" | ||
2443 | 9 | "Project-Id-Version: maas\n" | ||
2444 | 10 | "Report-Msgid-Bugs-To: maas@packages.debian.org\n" | ||
2445 | 11 | "POT-Creation-Date: 2012-10-04 13:40-0400\n" | ||
2446 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
2447 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
2448 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | ||
2449 | 15 | "Language: \n" | ||
2450 | 16 | "MIME-Version: 1.0\n" | ||
2451 | 17 | "Content-Type: text/plain; charset=CHARSET\n" | ||
2452 | 18 | "Content-Transfer-Encoding: 8bit\n" | ||
2453 | 19 | |||
2454 | 20 | #. Type: note | ||
2455 | 21 | #. Description | ||
2456 | 22 | #: ../maas-region-controller.templates:1001 | ||
2457 | 23 | msgid "Ubuntu MAAS Server" | ||
2458 | 24 | msgstr "" | ||
2459 | 25 | |||
2460 | 26 | #. Type: note | ||
2461 | 27 | #. Description | ||
2462 | 28 | #: ../maas-region-controller.templates:1001 | ||
2463 | 29 | msgid "" | ||
2464 | 30 | "The Ubuntu MAAS Server has been installed in your system. You can access the " | ||
2465 | 31 | "MAAS Web interface here:" | ||
2466 | 32 | msgstr "" | ||
2467 | 33 | |||
2468 | 34 | #. Type: note | ||
2469 | 35 | #. Description | ||
2470 | 36 | #: ../maas-region-controller.templates:1001 | ||
2471 | 37 | msgid " http://${MAAS_URL}/MAAS" | ||
2472 | 38 | msgstr "" | ||
2473 | 39 | |||
2474 | 40 | #. Type: note | ||
2475 | 41 | #. Description | ||
2476 | 42 | #: ../maas-region-controller.templates:1001 | ||
2477 | 43 | msgid "" | ||
2478 | 44 | "If the automatically detected address above is not in the same network as " | ||
2479 | 45 | "the MAAS clients, you need to reconfigure it:" | ||
2480 | 46 | msgstr "" | ||
2481 | 47 | |||
2482 | 48 | #. Type: note | ||
2483 | 49 | #. Description | ||
2484 | 50 | #: ../maas-region-controller.templates:1001 | ||
2485 | 51 | msgid " sudo dpkg-reconfigure maas-region-controller" | ||
2486 | 52 | msgstr "" | ||
2487 | 53 | |||
2488 | 54 | #. Type: string | ||
2489 | 55 | #. Description | ||
2490 | 56 | #: ../maas-region-controller.templates:2001 | ||
2491 | 57 | msgid "Ubuntu MAAS PXE/Provisioning network address:" | ||
2492 | 58 | msgstr "" | ||
2493 | 59 | |||
2494 | 60 | #. Type: string | ||
2495 | 61 | #. Description | ||
2496 | 62 | #: ../maas-region-controller.templates:2001 | ||
2497 | 63 | msgid "" | ||
2498 | 64 | "The Ubuntu MAAS Server automatically detects the IP address that is used for " | ||
2499 | 65 | "PXE and provisioning. However, it needs to be in the same network as the " | ||
2500 | 66 | "clients. If the automatically detected address is not in the same network as " | ||
2501 | 67 | "the clients, it must be changed." | ||
2502 | 68 | msgstr "" | ||
2503 | 69 | |||
2504 | 70 | #. Type: string | ||
2505 | 71 | #. Description | ||
2506 | 72 | #: ../maas-cluster-controller.templates:1001 | ||
2507 | 73 | msgid "Ubuntu MAAS API address:" | ||
2508 | 74 | msgstr "" | ||
2509 | 75 | |||
2510 | 76 | #. Type: string | ||
2511 | 77 | #. Description | ||
2512 | 78 | #: ../maas-cluster-controller.templates:1001 | ||
2513 | 79 | msgid "" | ||
2514 | 80 | "The MAAS Cluster Controller needs to contact the MAAS server to register its " | ||
2515 | 81 | "presence. Set the URL to the MAAS API here, e.g. http://192.168.1.1/MAAS" | ||
2516 | 82 | msgstr "" | ||
2517 | 0 | 83 | ||
2518 | === added file 'debian/python-django-maas.install' | |||
2519 | --- debian/python-django-maas.install 1970-01-01 00:00:00 +0000 | |||
2520 | +++ debian/python-django-maas.install 2012-11-13 12:12:21 +0000 | |||
2521 | @@ -0,0 +1,2 @@ | |||
2522 | 1 | debian/tmp/usr/lib/python*/dist-packages/maasserver | ||
2523 | 2 | debian/tmp/usr/lib/python*/dist-packages/metadataserver | ||
2524 | 0 | 3 | ||
2525 | === added file 'debian/python-maas-client.install' | |||
2526 | --- debian/python-maas-client.install 1970-01-01 00:00:00 +0000 | |||
2527 | +++ debian/python-maas-client.install 2012-11-13 12:12:21 +0000 | |||
2528 | @@ -0,0 +1,1 @@ | |||
2529 | 1 | debian/tmp/usr/lib/python*/dist-packages/apiclient | ||
2530 | 0 | 2 | ||
2531 | === added file 'debian/python-maas-provisioningserver.install' | |||
2532 | --- debian/python-maas-provisioningserver.install 1970-01-01 00:00:00 +0000 | |||
2533 | +++ debian/python-maas-provisioningserver.install 2012-11-13 12:12:21 +0000 | |||
2534 | @@ -0,0 +1,4 @@ | |||
2535 | 1 | debian/tmp/usr/lib/python*/dist-packages/provisioningserver | ||
2536 | 2 | |||
2537 | 3 | # Install other stuff | ||
2538 | 4 | debian/extras/maas-provision usr/sbin | ||
2539 | 0 | 5 | ||
2540 | === added file 'debian/rules' | |||
2541 | --- debian/rules 1970-01-01 00:00:00 +0000 | |||
2542 | +++ debian/rules 2012-11-13 12:12:21 +0000 | |||
2543 | @@ -0,0 +1,65 @@ | |||
2544 | 1 | #!/usr/bin/make -f | ||
2545 | 2 | |||
2546 | 3 | BUILDHOME = $(CURDIR)/debian/build | ||
2547 | 4 | PYTHON = $(shell pyversions -d) | ||
2548 | 5 | # Python enum modules. | ||
2549 | 6 | py_enums := $(wildcard src/*/enum.py) | ||
2550 | 7 | |||
2551 | 8 | %: | ||
2552 | 9 | dh $@ --with python2,apport --buildsystem=python_distutils | ||
2553 | 10 | |||
2554 | 11 | override_dh_installinit: | ||
2555 | 12 | dh_installinit --name maas-pserv | ||
2556 | 13 | dh_installinit --name maas-txlongpoll | ||
2557 | 14 | dh_installinit --name maas-region-celery | ||
2558 | 15 | dh_installinit --name maas-cluster-celery | ||
2559 | 16 | dh_installinit --name maas-dhcp-server | ||
2560 | 17 | |||
2561 | 18 | override_dh_auto_build: | ||
2562 | 19 | dh_auto_build | ||
2563 | 20 | |||
2564 | 21 | mkdir -p $(BUILDHOME) | ||
2565 | 22 | HOME=$(BUILDHOME) PYTHONPATH=$(CURDIR)/src/ $(PYTHON) \ | ||
2566 | 23 | $(CURDIR)/src/maasserver/utils/jsenums.py \ | ||
2567 | 24 | $(py_enums) > $(BUILDHOME)/enums.js | ||
2568 | 25 | |||
2569 | 26 | override_dh_auto_install: | ||
2570 | 27 | dh_auto_install | ||
2571 | 28 | |||
2572 | 29 | # Move static files | ||
2573 | 30 | install -d -m 755 $(CURDIR)/debian/tmp/usr/share/maas/web/static | ||
2574 | 31 | mv $(CURDIR)/debian/tmp/usr/lib/python*/*-packages/maasserver/static \ | ||
2575 | 32 | $(CURDIR)/debian/tmp/usr/share/maas/web/ | ||
2576 | 33 | |||
2577 | 34 | # Install built enums.js file. | ||
2578 | 35 | cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/ | ||
2579 | 36 | |||
2580 | 37 | # install the apparmor profile | ||
2581 | 38 | install -d -m 755 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d | ||
2582 | 39 | install -m 644 $(CURDIR)/debian/maas-dhcp.apparmor \ | ||
2583 | 40 | $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d/maas | ||
2584 | 41 | |||
2585 | 42 | dh_install --list-missing | ||
2586 | 43 | |||
2587 | 44 | override_dh_auto_clean: | ||
2588 | 45 | dh_auto_clean | ||
2589 | 46 | rm -rf $(BUILDHOME) | ||
2590 | 47 | rm -rf src/*.egg-info | ||
2591 | 48 | |||
2592 | 49 | DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST))) | ||
2593 | 50 | REV=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \ | ||
2594 | 51 | | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p') | ||
2595 | 52 | VER=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \ | ||
2596 | 53 | | sed -rne 's,^Version: ([^-]+).*,\1,p') | ||
2597 | 54 | get-orig-source: | ||
2598 | 55 | bzr export -r $(REV) --root=maas-$(VER).orig \ | ||
2599 | 56 | maas_$(VER).orig.tar.gz lp:maas/1.2 | ||
2600 | 57 | rm -rf maas-$(VER) | ||
2601 | 58 | tar -xf maas_$(VER).orig.tar.gz | ||
2602 | 59 | rm maas_$(VER).orig.tar.gz | ||
2603 | 60 | rm -rf maas-$(VER).orig/src/maasserver/static/jslibs/ | ||
2604 | 61 | rm -rf maas-$(VER).orig/contrib/python-tx-tftp | ||
2605 | 62 | GZIP=--best tar -cz --owner root --group root --mode a+rX \ | ||
2606 | 63 | -f maas_$(VER).orig.tar.gz \ | ||
2607 | 64 | maas-$(VER).orig | ||
2608 | 65 | rm -r maas-$(VER).orig | ||
2609 | 0 | 66 | ||
2610 | === added directory 'debian/source' | |||
2611 | === added file 'debian/source/format' | |||
2612 | --- debian/source/format 1970-01-01 00:00:00 +0000 | |||
2613 | +++ debian/source/format 2012-11-13 12:12:21 +0000 | |||
2614 | @@ -0,0 +1,1 @@ | |||
2615 | 1 | 3.0 (quilt) | ||
2616 | 0 | 2 | ||
2617 | === added directory 'debian/tests' | |||
2618 | === added file 'debian/tests/control' | |||
2619 | --- debian/tests/control 1970-01-01 00:00:00 +0000 | |||
2620 | +++ debian/tests/control 2012-11-13 12:12:21 +0000 | |||
2621 | @@ -0,0 +1,2 @@ | |||
2622 | 1 | Tests: maas-package-test | ||
2623 | 2 | Depends: @, python-nose, xvfb, python-pip | ||
2624 | 0 | 3 | ||
2625 | === added file 'debian/tests/maas-integration.py' | |||
2626 | --- debian/tests/maas-integration.py 1970-01-01 00:00:00 +0000 | |||
2627 | +++ debian/tests/maas-integration.py 2012-11-13 12:12:21 +0000 | |||
2628 | @@ -0,0 +1,72 @@ | |||
2629 | 1 | # TODO | ||
2630 | 2 | # - send ipmi commands to turn on/off nodes | ||
2631 | 3 | # - run import pxe files | ||
2632 | 4 | # - check node states once they're on/off | ||
2633 | 5 | # - check node state changes (declared -> commissionig -> ready) | ||
2634 | 6 | import os | ||
2635 | 7 | from subprocess import check_output | ||
2636 | 8 | import sys | ||
2637 | 9 | from unittest import TestCase | ||
2638 | 10 | |||
2639 | 11 | from pyvirtualdisplay import Display | ||
2640 | 12 | from sst.actions import ( | ||
2641 | 13 | assert_url, assert_text_contains, assert_title_contains, click_button, | ||
2642 | 14 | get_element, go_to, write_textfield) | ||
2643 | 15 | |||
2644 | 16 | |||
2645 | 17 | sys.path.insert(0, "/usr/share/maas") | ||
2646 | 18 | os.environ['DJANGO_SETTINGS_MODULE'] = 'maas.settings' | ||
2647 | 19 | from maasserver.models import User | ||
2648 | 20 | |||
2649 | 21 | MAAS_URL = "http://10.98.0.13/MAAS" | ||
2650 | 22 | ADMIN_USER = "admin" | ||
2651 | 23 | PASSWORD = "test" | ||
2652 | 24 | |||
2653 | 25 | |||
2654 | 26 | class TestMAASIntegration(TestCase): | ||
2655 | 27 | |||
2656 | 28 | def setUp(self): | ||
2657 | 29 | self.display = Display(visible=0, size=(1280, 1024)) | ||
2658 | 30 | self.display.start() | ||
2659 | 31 | |||
2660 | 32 | def tearDown(self): | ||
2661 | 33 | self.display.stop() | ||
2662 | 34 | |||
2663 | 35 | def createadmin(self): | ||
2664 | 36 | """Run sudo maas createsuperuser.""" | ||
2665 | 37 | cmd_output = check_output( | ||
2666 | 38 | ["sudo", "maas", "createsuperuser", "--username=%s" % ADMIN_USER, | ||
2667 | 39 | "--email=example@canonical.com", "--noinput"]) | ||
2668 | 40 | ## Set password for admin user. | ||
2669 | 41 | try: | ||
2670 | 42 | admin = User.objects.get(username=ADMIN_USER) | ||
2671 | 43 | except User.DoesNotExist: | ||
2672 | 44 | admin = User(username=ADMIN_USER) | ||
2673 | 45 | admin.set_password(PASSWORD) | ||
2674 | 46 | admin.save() | ||
2675 | 47 | return cmd_output | ||
2676 | 48 | |||
2677 | 49 | def installation(self): | ||
2678 | 50 | # Check the installation worked. | ||
2679 | 51 | go_to(MAAS_URL) | ||
2680 | 52 | assert_text_contains( | ||
2681 | 53 | get_element(tag="body"), "No admin user has been created yet") | ||
2682 | 54 | |||
2683 | 55 | def createadmin_and_login(self): | ||
2684 | 56 | ## Creates the admin user. | ||
2685 | 57 | output = self.createadmin() | ||
2686 | 58 | self.assertEqual(output, 'Superuser created successfully.') | ||
2687 | 59 | ## Login with the newly created admin user | ||
2688 | 60 | go_to(MAAS_URL) | ||
2689 | 61 | assert_text_contains( | ||
2690 | 62 | get_element(tag="body"), "Login to lenovo-RD230-01 MAAS") | ||
2691 | 63 | write_textfield("id_username", ADMIN_USER) | ||
2692 | 64 | write_textfield("id_password", PASSWORD) | ||
2693 | 65 | click_button("Login") | ||
2694 | 66 | assert_url("MAAS/") | ||
2695 | 67 | assert_title_contains("Dashboard") | ||
2696 | 68 | |||
2697 | 69 | def test_integration(self): | ||
2698 | 70 | # Run the integration tests in order. | ||
2699 | 71 | self.installation() | ||
2700 | 72 | self.createadmin_and_login() | ||
2701 | 0 | 73 | ||
2702 | === added file 'debian/tests/maas-package-test' | |||
2703 | --- debian/tests/maas-package-test 1970-01-01 00:00:00 +0000 | |||
2704 | +++ debian/tests/maas-package-test 2012-11-13 12:12:21 +0000 | |||
2705 | @@ -0,0 +1,5 @@ | |||
2706 | 1 | #!/bin/sh | ||
2707 | 2 | set -e -u | ||
2708 | 3 | exec 2>&1 | ||
2709 | 4 | pip install sst | ||
2710 | 5 | nosetests debian/tests/maas-integration.py | ||
2711 | 0 | 6 | ||
2712 | === added file 'debian/watch' | |||
2713 | --- debian/watch 1970-01-01 00:00:00 +0000 | |||
2714 | +++ debian/watch 2012-11-13 12:12:21 +0000 | |||
2715 | @@ -0,0 +1,2 @@ | |||
2716 | 1 | version=3 | ||
2717 | 2 | http://launchpad.net/maas/+download https://launchpad.net/maas/.*/maas-(.*).tar.* |