orchestra team mailing list archive

[Adam Gandelman <adam.gandelman@xxxxxxxxxxxxx>]

Adam Gandelman has proposed merging lp:~gandelman-a/orchestra/lp852250 into lp:orchestra.

Requested reviews:
  orchestra (orchestra)
Related bugs:
  Bug #852250 in orchestra (Ubuntu): "provisioning server uses outdated /var/lib/webdav/formulas directory"
  https://bugs.launchpad.net/ubuntu/+source/orchestra/+bug/852250

For more details, see:
https://code.launchpad.net/~gandelman-a/orchestra/lp852250/+merge/75832

Updated the webdav directory from formulas to charms to accommodate the name change (juju deploy is broken if directory isn't renamed accordingly)
-- 
https://code.launchpad.net/~gandelman-a/orchestra/lp852250/+merge/75832
Your team orchestra is requested to review the proposed merge of lp:~gandelman-a/orchestra/lp852250 into lp:orchestra.

=== modified file 'debian/ubuntu-orchestra-provisioning-server.postinst'
--- debian/ubuntu-orchestra-provisioning-server.postinst	2011-09-16 15:07:42 +0000
+++ debian/ubuntu-orchestra-provisioning-server.postinst	2011-09-16 23:30:28 +0000
@@ -104,7 +104,7 @@
 	# Enable and configure webdav
 	a2enmod dav_fs
 	a2enmod dav
-	mkdir -p /var/lib/webdav/formulas
+	mkdir -p /var/lib/webdav/charms
 	chown -R www-data:www-data /var/lib/webdav/
 	# Need to restart apache to pickup web configs
 	if [ -f /usr/sbin/apache2ctl ]; then

=== modified file 'debian/ubuntu-orchestra-provisioning-server.postrm'
--- debian/ubuntu-orchestra-provisioning-server.postrm	2011-09-16 15:07:42 +0000
+++ debian/ubuntu-orchestra-provisioning-server.postrm	2011-09-16 23:30:28 +0000
@@ -4,7 +4,7 @@
 
 	# Remove juju storage configuration
 	rm -f /etc/apache2/conf.d/juju_webdav.conf
-	rm -rf /var/lib/webdav/formulas
+	rm -rf /var/lib/webdav/charms
 
 	# Need to restart apache to pickup web configs
 	if [ -f /usr/sbin/apache2ctl ]; then