Merge lp:~andreserl/maas/packaging_updates_bzr415_1 into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 39
Merged at revision: 38
Proposed branch: lp:~andreserl/maas/packaging_updates_bzr415_1
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 167 lines (+64/-8)
10 files modified
debian/changelog (+13/-1)
debian/control (+3/-2)
debian/maas-dhcp.lintian-overrides (+1/-0)
debian/maas-dhcp.postrm (+20/-0)
debian/maas.config (+1/-2)
debian/maas.lintian-overrides (+7/-0)
debian/maas.postinst (+3/-3)
debian/patches/01-fix-database-settings.patch (+6/-0)
debian/patches/02-pserv-config.patch (+5/-0)
debian/patches/03-txlongpoll-config.patch (+5/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_updates_bzr415_1
Reviewer Review Type Date Requested Status
Scott Moser (community) Approve
Review via email: mp+101435@code.launchpad.net

Commit message

* Make package lintian clean:
  - maas{-dhcp}.lintian-overrides: Add to make lintian clean.
  - debian/control: Add missing dependencies; correct section and desc.
  - debian/maas.postinst: Do not use absolute path for rabbitmqctl.
  - debian/patches: Add headers to all patches.
* debian/maas-dhcp.postrm: Added to disable dnsmasq in cobbler on removal.
* debian/maas.config: Do not set a password with pwgen as it is not an
  essential package; allow dbconfig-common to create a password instead by
  creating an empty question. (LP: #977475)

To post a comment you must log in.
39. By Andres Rodriguez

debian/control: Add pwgen dependecy which was mistakenly removed

Revision history for this message
Scott Moser (smoser) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-04-10 04:29:14 +0000
3+++ debian/changelog 2012-04-10 20:31:18 +0000
4@@ -1,8 +1,20 @@
5 maas (0.1+bzr415+dfsg-0ubuntu3) UNRELEASED; urgency=low
6
7+ [ Scott Moser ]
8 * add dependency on distro-info (LP: #949442)
9
10- -- Scott Moser <smoser@ubuntu.com> Mon, 09 Apr 2012 22:19:51 -0400
11+ [ Andres Rodriguez ]
12+ * Make package lintian clean:
13+ - maas{-dhcp}.lintian-overrides: Add to make lintian clean.
14+ - debian/control: Add missing dependencies; correct section and desc.
15+ - debian/maas.postinst: Do not use absolute path for rabbitmqctl.
16+ - debian/patches: Add headers to all patches.
17+ * debian/maas-dhcp.postrm: Added to disable dnsmasq in cobbler on removal.
18+ * debian/maas.config: Do not set a password with pwgen as it is not an
19+ essential package; allow dbconfig-common to create a password instead by
20+ creating an empty question. (LP: #977475)
21+
22+ -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 10 Apr 2012 14:55:32 -0400
23
24 maas (0.1+bzr415+dfsg-0ubuntu2) precise; urgency=low
25
26
27=== modified file 'debian/control'
28--- debian/control 2012-04-10 04:29:14 +0000
29+++ debian/control 2012-04-10 20:31:18 +0000
30@@ -40,6 +40,7 @@
31
32
33 Package: python-django-maas
34+Section: python
35 Architecture: all
36 Depends: python-avahi,
37 python-convoy,
38@@ -71,8 +72,8 @@
39
40 Package: maas-dhcp
41 Architecture: all
42-Depends: maas, dnsmasq
43-Description: Ubuntu MAAS Server - DHCP configuration
44+Depends: ${misc:Depends}, maas, debconf, dnsmasq
45+Description: Ubuntu MAAS Server - DHCP configuration (metapackage)
46 Ubuntu MAAS Server is the successor to Orchestra. It offers a
47 nice UI to provision your Ubuntu servers. Each physical server
48 (“node”) will be commissioned automatically on first boot.
49
50=== added file 'debian/maas-dhcp.lintian-overrides'
51--- debian/maas-dhcp.lintian-overrides 1970-01-01 00:00:00 +0000
52+++ debian/maas-dhcp.lintian-overrides 2012-04-10 20:31:18 +0000
53@@ -0,0 +1,1 @@
54+maas-dhcp: postinst-uses-db-input
55
56=== added file 'debian/maas-dhcp.postrm'
57--- debian/maas-dhcp.postrm 1970-01-01 00:00:00 +0000
58+++ debian/maas-dhcp.postrm 2012-04-10 20:31:18 +0000
59@@ -0,0 +1,20 @@
60+#!/bin/sh
61+
62+set -e
63+
64+. /usr/share/debconf/confmodule
65+db_version 2.0
66+
67+if [ "$1" = "purge" ] ; then
68+ if [ -f /etc/cobbler/settings ]; then
69+ sed -i -e "s/^manage_dns:.*$/manage_dns: 0/" \
70+ -e "s/^manage_dhcp:.*$/manage_dhcp: 0/" /etc/cobbler/settings
71+ fi
72+ if [ -x /usr/sbin/invoke-rc.d ]; then
73+ invoke-rc.d cobbler restart || true
74+ fi
75+fi
76+
77+#DEBHELPER#
78+
79+exit 0
80
81=== modified file 'debian/maas.config'
82--- debian/maas.config 2012-04-04 18:52:33 +0000
83+++ debian/maas.config 2012-04-10 20:31:18 +0000
84@@ -22,13 +22,12 @@
85 fi
86
87 if ([ "$1" = "configure" ] && [ -z "$2" ]); then
88- maas_db_pass=`pwgen`
89 dbc_dbname="maasdb"
90 dbc_dbuser="maas"
91- dbc_dbpass="$maas_db_pass"
92 dbc_remove="true"
93
94 # Hide maas/dbconfig-install question by setting default.
95 set_question maas/dbconfig-install true
96+ set_question maas/pgsql/app-pass ""
97 dbc_go maas $@
98 fi
99
100=== added file 'debian/maas.lintian-overrides'
101--- debian/maas.lintian-overrides 1970-01-01 00:00:00 +0000
102+++ debian/maas.lintian-overrides 2012-04-10 20:31:18 +0000
103@@ -0,0 +1,7 @@
104+maas: embedded-javascript-library usr/share/maas/web/static/jslibs/yui/3.4.1/build/yui/yui-min.js
105+maas: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/panel/vendor/prettify/COPYING
106+maas: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/vendor/prettify/COPYING
107+maas: script-not-executable usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js
108+maas: unusual-interpreter usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js #!node
109+maas: postinst-uses-db-input
110+maas: binary-without-manpage usr/bin/maas
111
112=== modified file 'debian/maas.postinst'
113--- debian/maas.postinst 2012-04-04 18:52:33 +0000
114+++ debian/maas.postinst 2012-04-10 20:31:18 +0000
115@@ -115,9 +115,9 @@
116 longpoll_pass=`pwgen`
117 longpoll_vhost="/maas_longpoll"
118 if [ -x /usr/sbin/rabbitmqctl ]; then
119- /usr/sbin/rabbitmqctl add_user "$longpoll_user" "$longpoll_pass" || true
120- /usr/sbin/rabbitmqctl add_vhost "$longpoll_vhost" || true
121- /usr/sbin/rabbitmqctl set_permissions -p "$longpoll_vhost" "$longpoll_user" ".*" ".*" ".*" || true
122+ rabbitmqctl add_user "$longpoll_user" "$longpoll_pass" || true
123+ rabbitmqctl add_vhost "$longpoll_vhost" || true
124+ rabbitmqctl set_permissions -p "$longpoll_vhost" "$longpoll_user" ".*" ".*" ".*" || true
125 fi
126
127 if grep -qs "^\ \{1,\}password: \"[a-zA-Z0-9]\{0,\}\"$" /etc/maas/txlongpoll.yaml; then
128
129=== modified file 'debian/patches/01-fix-database-settings.patch'
130--- debian/patches/01-fix-database-settings.patch 2012-03-19 20:19:42 +0000
131+++ debian/patches/01-fix-database-settings.patch 2012-04-10 20:31:18 +0000
132@@ -1,3 +1,9 @@
133+Description: Use default settings for MAAS
134+ Use default settings for MAAS to work out of the box.
135+ These include setting PSERV_URL, STATIC_ROOT, and the
136+ configuration for the database.
137+Author: Andres Rodriguez <andreserl@ubuntu.com>
138+
139 Index: maas-0.1+bzr309+dfsg.orig/contrib/maas_local_settings_sample.py
140 ===================================================================
141 --- maas-0.1+bzr309+dfsg.orig.orig/contrib/maas_local_settings_sample.py 2012-03-19 14:56:36.884477638 -0400
142
143=== modified file 'debian/patches/02-pserv-config.patch'
144--- debian/patches/02-pserv-config.patch 2012-04-03 14:14:35 +0000
145+++ debian/patches/02-pserv-config.patch 2012-04-10 20:31:18 +0000
146@@ -1,3 +1,8 @@
147+Description: Use default settings for MAAS PSERV
148+ Use default settings for MAAS pserv. These default settings
149+ include port, logfile, oops directory, cobbler url and username
150+Author: Andres Rodriguez <andreserl@ubuntu.com>
151+
152 Index: maas-0.1+bzr398+dfsg.orig/etc/pserv.yaml
153 ===================================================================
154 --- maas-0.1+bzr398+dfsg.orig.orig/etc/pserv.yaml 2012-04-03 09:49:48.153428333 -0400
155
156=== modified file 'debian/patches/03-txlongpoll-config.patch'
157--- debian/patches/03-txlongpoll-config.patch 2012-04-03 14:14:35 +0000
158+++ debian/patches/03-txlongpoll-config.patch 2012-04-10 20:31:18 +0000
159@@ -1,3 +1,8 @@
160+Description: Use default settings for MAAS txlongpoll
161+ Use default settings for MAAS txlongpoll. These default settings
162+ include oops directory, Message broker configuration, logfile.
163+Author: Andres Rodriguez <andreserl@ubuntu.com>
164+
165 Index: maas-0.1+bzr398+dfsg.orig/etc/txlongpoll.yaml
166 ===================================================================
167 --- maas-0.1+bzr398+dfsg.orig.orig/etc/txlongpoll.yaml 2012-04-03 09:49:48.109427702 -0400

Subscribers

People subscribed via source and target branches

to all changes: