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

[Andres Rodriguez]

Various packaging improvements that include:
 - txlongpoll packaging integration.
 - Fixes in postinst, postrm, prerm, including bug (LP: #955400)
 - Fixes to maas wrapper.
 - add a logrotate file.

[Francis J. Lacoste (flacoste)]

Hi Andres,

This is starting to look good!

I have few comments, but probably all things that can be fixed in the next
iteration.

[1]

81 === renamed file 'debian/maas.upstart' => 'debian/maas.maas-pserv.upstart'
82 --- debian/maas.upstart 2012-03-13 18:16:33 +0000
83 +++ debian/maas.maas-pserv.upstart 2012-03-14 23:33:18 +0000
84 @@ -11,4 +11,4 @@
85 respawn
86
87 # To add options to your daemon, edit the line below:
88 -exec /usr/bin/twistd -n maas-pserv --config-file=/etc/maas/pserv.yaml
89 +exec /usr/bin/twistd -n --pidfile=/run/maas-pserv.pid --logfile=/var/log/maas/maas-pserv.log maas-pserv --config-file=/etc/maas/pserv.yaml

We can configure that one like the txlongpoll one. Use --logfile=/dev/null and
set the log file in the configuration file.

We should probably not run this service as root. Daviey suggested running the
txlongpoll, pserv and maas as a maas user. (That means also going to
WSGIDaemonProcess for the apache config.)

[2]

91 === added file 'debian/maas.maas-txlongpoll.upstart'
92 --- debian/maas.maas-txlongpoll.upstart 1970-01-01 00:00:00 +0000
93 +++ debian/maas.maas-txlongpoll.upstart 2012-03-14 23:33:18 +0000
94 @@ -0,0 +1,14 @@
95 +# maas - txlongpoll service
96 +#
97 +# MaaS Provisioning Service txlongpoll
98 +
99 +description "MaaS"
100 +author "Andres Rodriguez <email address hidden>"
101 +
102 +start on filesystem and net-device-up
103 +stop on runlevel [016]
104 +
105 +respawn
106 +
107 +# To add options to your daemon, edit the line below:
108 +exec /usr/bin/twistd -n --pidfile=/run/maas-txlongpoll.pid --logfile=/dev/null txlongpoll --config-file=/etc/maas/txlongpoll.yaml

Same comment about running this as the maas user.

[3]

133 + if [ ! -f /var/log/maas/maas.log ]; then
134 + touch /var/log/maas/maas.log
135 + chown -R root:www-data /var/log/maas
136 + chmod 620 /var/log/maas/maas.log
137 + chmod -R 775 /var/log/maas/oops
138 fi

The permission and ownership on /var/log/maas/oops should probably be set
regardless of the existence of maas.log

Can't those be set by the packaging info?

[4]

We probably want logrotate configs for both the pserv and txlongpoll log
files. They do support log reopening on a USR1 signal.

Cheers

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-13 18:35:01 +0000
+++ debian/changelog	2012-03-14 23:33:18 +0000
@@ -1,8 +1,21 @@
-maas (0.1+bzr266+dfsg-0ubuntu2) UNRELEASED; urgency=low
-
-  * UNRELEASED
-
- -- Andres Rodriguez <[e-mail]>  Tue, 13 Mar 2012 14:34:41 -0400
+maas (0.1+bzr283+dfsg-0ubuntu1) UNRELEASED; urgency=low
+
+  * debian/maas.upstart: Specify pidfile and conffile.
+  * debian/maas.postinst:
+    - Only run syncdb if dbconfig postinst file exists.
+    - Fix file permissions.
+  * debian/maas.{postrm,prerm}: Add dbconfig-common support.
+  * Add txlongpoll support for packaging:
+    - debian/control: Depends on python-txlongpoll.
+    - debian/maas.maas-longpoll.upstart: Added to start txlongpoll.
+    - debian/maas.install: Install txlongpoll.yaml
+  * debian/extras/maas: Improvements.
+  * debian/maas.maas.upstart: Moved from debian/maas.upstart.
+  * debian/maas.postinst: Touch logfile to set correct permissions (LP: #955400)
+  * debian/maas.logrotate: Add.
+  * debian/patches/03-txlongpoll-config.patch: Add default settings.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 14 Mar 2012 18:27:31 -0400
 
 maas (0.1+bzr266+dfsg-0ubuntu1) precise; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-03-13 18:16:33 +0000
+++ debian/control	2012-03-14 23:33:18 +0000
@@ -40,6 +40,7 @@
          python-sphinx,
          python-twisted,
          python-txamqp,
+         python-txlongpoll,
          python-zope.interface
 Description: The next step in the development of Orchestra.
  It provides an easy to use UI to provision your Ubuntu servers.

=== modified file 'debian/extras/maas'
--- debian/extras/maas	2012-03-09 22:55:04 +0000
+++ debian/extras/maas	2012-03-14 23:33:18 +0000
@@ -1,4 +1,4 @@
 #!/bin/bash -eu
-export PYTHONPATH="/usr/share/maas${PYTHONPATH:+}${PYTHONPATH:-}"
+export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH:-}"
 export DJANGO_SETTINGS_MODULE="maas.settings"
-exec /usr/bin/django-admin $@
+exec /usr/bin/django-admin "$@"

=== modified file 'debian/maas.install'
--- debian/maas.install	2012-03-13 18:16:33 +0000
+++ debian/maas.install	2012-03-14 23:33:18 +0000
@@ -2,6 +2,7 @@
 debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas
 twisted/plugins/maasps.py usr/share/pyshared/twisted/plugins
 etc/pserv.yaml etc/maas
+etc/txlongpoll.yaml etc/maas
 
 # Install static files
 debian/tmp/usr/share/maas/web/static

=== added file 'debian/maas.logrotate'
--- debian/maas.logrotate	1970-01-01 00:00:00 +0000
+++ debian/maas.logrotate	2012-03-14 23:33:18 +0000
@@ -0,0 +1,9 @@
+/var/log/maas/maas.log {
+ rotate 5
+ weekly
+ compress
+ copytruncate
+ missingok
+ #create 620 root www-data
+}
+

=== renamed file 'debian/maas.upstart' => 'debian/maas.maas-pserv.upstart'
--- debian/maas.upstart	2012-03-13 18:16:33 +0000
+++ debian/maas.maas-pserv.upstart	2012-03-14 23:33:18 +0000
@@ -11,4 +11,4 @@
 respawn
 
 # To add options to your daemon, edit the line below:
-exec /usr/bin/twistd -n maas-pserv --config-file=/etc/maas/pserv.yaml
+exec /usr/bin/twistd -n --pidfile=/run/maas-pserv.pid --logfile=/var/log/maas/maas-pserv.log maas-pserv --config-file=/etc/maas/pserv.yaml

=== added file 'debian/maas.maas-txlongpoll.upstart'
--- debian/maas.maas-txlongpoll.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas.maas-txlongpoll.upstart	2012-03-14 23:33:18 +0000
@@ -0,0 +1,14 @@
+# maas - txlongpoll service
+#
+# MaaS Provisioning Service txlongpoll
+
+description     "MaaS"
+author "Andres Rodriguez <[e-mail]>"
+
+start on filesystem and net-device-up
+stop on runlevel [016]
+
+respawn
+
+# To add options to your daemon, edit the line below:
+exec /usr/bin/twistd -n --pidfile=/run/maas-txlongpoll.pid --logfile=/dev/null txlongpoll --config-file=/etc/maas/txlongpoll.yaml

=== modified file 'debian/maas.postinst'
--- debian/maas.postinst	2012-03-13 18:16:33 +0000
+++ debian/maas.postinst	2012-03-14 23:33:18 +0000
@@ -3,7 +3,12 @@
 . /usr/share/debconf/confmodule
 db_version 2.0
 
-. /usr/share/dbconfig-common/dpkg/postinst.pgsql
+sync_db=true
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
+	. /usr/share/dbconfig-common/dpkg/postinst.pgsql
+else
+	sync_db=false
+fi
 
 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
 
@@ -28,8 +33,11 @@
 	fi
 
 	# Give appropriate permissions
-	if [ -f /var/log/maas/maas.log ]; then
-		chown www-data:www-data /var/log/maas/maas.log
+	if [ ! -f /var/log/maas/maas.log ]; then
+		touch /var/log/maas/maas.log
+		chown -R root:www-data /var/log/maas
+		chmod 620 /var/log/maas/maas.log
+		chmod -R 775 /var/log/maas/oops
 	fi
 	
 	# Configure database
@@ -38,8 +46,9 @@
 		sed -i "s/^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$/        'PASSWORD': '"$dbc_dbpass"',/" \
                        /usr/share/maas/maas_local_settings.py
 	fi
-
-	maas syncdb --noinput
+	if $syncdb; then
+		maas syncdb --noinput
+	fi
 fi
 
 #DEBHELPER#

=== modified file 'debian/maas.postrm'
--- debian/maas.postrm	2012-03-13 18:16:33 +0000
+++ debian/maas.postrm	2012-03-14 23:33:18 +0000
@@ -3,8 +3,21 @@
 set -e
 
 . /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/postrm.pgsql
-dbc_go maas $@
+
+if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
+	. /usr/share/dbconfig-common/dpkg/postrm.pgsql
+	dbc_go maas $@
+fi
+
+case "$1" in
+	purge)
+		rm -rf /var/log/maas
+		if [ -h /etc/apache2/conf.d/maas-http.conf ]; then
+			rm -rf /etc/apache2/conf.d/maas-http.conf
+		fi
+
+esac
 
 #DEBHELPER#
 
+exit 0

=== added file 'debian/maas.prerm'
--- debian/maas.prerm	1970-01-01 00:00:00 +0000
+++ debian/maas.prerm	2012-03-14 23:33:18 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/prerm.pgsql
+dbc_go maas $@
+
+#DEBHELPER#
+
+exit 0

=== removed file 'debian/maas.templates'
--- debian/maas.templates	2012-03-09 22:55:04 +0000
+++ debian/maas.templates	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Template: maas/maas_admin_user
-Type: string
-Default: admin
-_Description: Create administrator username for MaaS:
- MaaS requires to set an administrative user in order to
- be able to gain access to the MaaS management WebUI.
-
-Template: maas/maas_admin_pass
-Type: password
-_Description: Set password for the administrator username:
- It is highly recommendaed that you set a password for the
- administrative user that has just been created.

=== modified file 'debian/patches/01-fix-database-settings.patch'
--- debian/patches/01-fix-database-settings.patch	2012-03-13 18:16:33 +0000
+++ debian/patches/01-fix-database-settings.patch	2012-03-14 23:33:18 +0000
@@ -1,9 +1,9 @@
-Index: maas-0.1+bzr259+dfsg.orig/contrib/maas_local_settings_sample.py
+Index: maas-0.1+bzr281+dfsg.orig/contrib/maas_local_settings_sample.py
 ===================================================================
---- maas-0.1+bzr259+dfsg.orig.orig/contrib/maas_local_settings_sample.py	2012-03-13 10:38:48.251620276 -0400
-+++ maas-0.1+bzr259+dfsg.orig/contrib/maas_local_settings_sample.py	2012-03-13 10:39:05.362341275 -0400
-@@ -2,7 +2,7 @@
- DEBUG = False
+--- maas-0.1+bzr281+dfsg.orig.orig/contrib/maas_local_settings_sample.py	2012-03-14 14:29:12.145287076 -0400
++++ maas-0.1+bzr281+dfsg.orig/contrib/maas_local_settings_sample.py	2012-03-14 14:29:16.421288467 -0400
+@@ -7,7 +7,7 @@
+ DEFAULT_MAAS_URL = "http://maas.internal.example.com/"
  
  # Absolute path to the directory static files should be collected to.
 -STATIC_ROOT = '/var/lib/maas/static/'
@@ -11,7 +11,7 @@
  
  # Prefix to use for MaaS's urls.
  # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with
-@@ -51,9 +51,9 @@
+@@ -56,9 +56,9 @@
      'default': {
          # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.
          'ENGINE': 'django.db.backends.postgresql_psycopg2',

=== modified file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2012-03-13 18:16:33 +0000
+++ debian/patches/02-pserv-config.patch	2012-03-14 23:33:18 +0000
@@ -1,8 +1,24 @@
-Index: maas-0.1+bzr259+dfsg.orig/etc/pserv.yaml
+Index: maas-0.1+bzr283+dfsg.orig/etc/pserv.yaml
 ===================================================================
---- maas-0.1+bzr259+dfsg.orig.orig/etc/pserv.yaml	2012-03-13 00:56:24.000000000 -0400
-+++ maas-0.1+bzr259+dfsg.orig/etc/pserv.yaml	2012-03-13 10:38:19.502618329 -0400
-@@ -35,6 +35,6 @@
+--- maas-0.1+bzr283+dfsg.orig.orig/etc/pserv.yaml	2012-03-14 17:20:20.000000000 -0400
++++ maas-0.1+bzr283+dfsg.orig/etc/pserv.yaml	2012-03-14 17:32:54.883813955 -0400
+@@ -10,13 +10,13 @@
+ ## running server.
+ #
+ # logfile: "pserv.log"
+-logfile: "logs/pserv.log"
++logfile: "/var/log/maas/pserv.log"
+ 
+ ## OOPS configuration (optional).
+ #
+ oops:
+   # directory:
+-  directory: "logs"
++  directory: "/var/log/maas/oops"
+   # reporter:
+   reporter: "maas-pserv"
+ 
+@@ -38,6 +38,6 @@
    # password: "test"
  
    # vdenv specific; see vdenv/README.txt.

=== added file 'debian/patches/03-txlongpoll-config.patch'
--- debian/patches/03-txlongpoll-config.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03-txlongpoll-config.patch	2012-03-14 23:33:18 +0000
@@ -0,0 +1,19 @@
+Index: maas-0.1+bzr283+dfsg.orig/etc/txlongpoll.yaml
+===================================================================
+--- maas-0.1+bzr283+dfsg.orig.orig/etc/txlongpoll.yaml	2012-03-14 17:07:57.000000000 -0400
++++ maas-0.1+bzr283+dfsg.orig/etc/txlongpoll.yaml	2012-03-14 17:34:05.767900696 -0400
+@@ -15,7 +15,7 @@
+ oops:
+   ## Directory in which to place OOPS reports.
+   # directory: ""
+-  directory: "logs"
++  directory: "/var/log/maas/oops"
+   ## The reporter used when generating OOPS reports.
+   # reporter: "LONGPOLL"
+   reporter: "maas-txlongpoll"
+@@ -33,4 +33,4 @@
+ ## running server.
+ #
+ # logfile: "txlongpoll.log"
+-logfile: "logs/txlongpoll.log"
++logfile: "/var/log/maas/txlongpoll.log"

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-13 18:16:33 +0000
+++ debian/patches/series	2012-03-14 23:33:18 +0000
@@ -1,2 +1,3 @@
 01-fix-database-settings.patch
 02-pserv-config.patch
+03-txlongpoll-config.patch

=== modified file 'debian/rules'
--- debian/rules	2012-03-13 18:16:33 +0000
+++ debian/rules	2012-03-14 23:33:18 +0000
@@ -3,6 +3,10 @@
 %:
 	dh $@ --with python2 --buildsystem=python_distutils
 
+override_dh_installinit:
+	dh_installinit --name maas-pserv
+	dh_installinit --name maas-txlongpoll
+
 override_dh_auto_install:
 	dh_auto_install