Bug#548084: aegir-provision: diff for NMU version 0.3-2.2

[Alexander Reichle-Schmehl]

tags 548085 + patch
tags 548085 + pending
tags 548084 + patch
tags 548084 + pending
thanks

Dear maintainer,

I've prepared an NMU for aegir-provision (versioned as 0.3-2.2) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.


diff -u aegir-provision-0.3/debian/aegir-provision.postinst aegir-provision-0.3/debian/aegir-provision.postinst
--- aegir-provision-0.3/debian/aegir-provision.postinst
+++ aegir-provision-0.3/debian/aegir-provision.postinst
@@ -90,13 +90,14 @@
 <?php
 # this file is automatically regenerated by aegir-provision postinst scripts
 # modify at your own risks
-$options['web_group'] = 'www-data';
-$options['script_user'] = 'aegir';
-$options['backup_path'] = '/var/backups/aegir';
-$options['config_path'] = '/etc/aegir';
-$options['restart_cmd'] = 'sudo $command graceful';
+\$options['web_group'] = 'www-data';
+\$options['script_user'] = 'aegir';
+\$options['backup_path'] = '/var/backups/aegir';
+\$options['config_path'] = '/etc/aegir';
+\$options['restart_cmd'] = 'sudo \$command graceful';
 EOF
         ucf $TEMPFILE /etc/aegir/drushrc.php
+	chown aegir:aegir /etc/aegir/drushrc.php
         rm -f $TEMPFILE
         ucfr aegir-provision /etc/aegir/drushrc.php
 
diff -u aegir-provision-0.3/debian/aegir-provision.postrm aegir-provision-0.3/debian/aegir-provision.postrm
--- aegir-provision-0.3/debian/aegir-provision.postrm
+++ aegir-provision-0.3/debian/aegir-provision.postrm
@@ -29,7 +29,9 @@
             echo >&2 "not removing aegir system account because deluser command was not found"
         fi
 
-        ucf --purge /etc/sudoers.d/aegir
+        if which ucf >/dev/null; then
+            ucf --purge /etc/sudoers.d/aegir
+        fi
         rm -f /etc/sudoers.d/aegir
 
         ( rm /etc/apache/conf.d/aegir.conf > /dev/null 2>&1 && invoke-rc.d apache force-reload ) || true
@@ -39,6 +41,11 @@
             sed  -i -e "/require_once('\/etc\/aegir\/drushrc.php');/d" /etc/drush/drushrc.php
         fi
 
+        if  which ucf >/dev/null; then
+	    ucf --purge /etc/aegir/drushrc.php
+        fi
+        rm -f /etc/aegir/drushrc.php
+
         ;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
diff -u aegir-provision-0.3/debian/changelog aegir-provision-0.3/debian/changelog
--- aegir-provision-0.3/debian/changelog
+++ aegir-provision-0.3/debian/changelog
@@ -1,3 +1,15 @@
+aegir-provision (0.3-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Create parsable configuration file (Closes: #548084)
+  * Correct ownership of /etc/aegir/drushrc.php (Closes: #548085)
+    (Works at least for new installations; and as the package hasn't been
+    part of a stable release, that should be okay)
+  * Also purge /etc/aegir/drushrc.php on purge (Not reported by would be
+    detected by the next piuparts run)
+
+ -- Alexander Reichle-Schmehl <toli...@debian.org>  Mon, 19 Jul 2010 11:09:14 +0200
+
 aegir-provision (0.3-2.1) unstable; urgency=critical
 
   * Non-maintainer upload.