Orchestra

Merge lp:~gandelman-a/orchestra/lp852250 into lp:orchestra

Proposed by Adam Gandelman on 2011-09-16

Status:	Merged
Approved by:	Andres Rodriguez on 2011-09-17
Approved revision:	242
Merged at revision:	242
Proposed branch:	lp:~gandelman-a/orchestra/lp852250
Merge into:	lp:orchestra
Diff against target:	25 lines (+2/-2) 2 files modified debian/ubuntu-orchestra-provisioning-server.postinst (+1/-1) debian/ubuntu-orchestra-provisioning-server.postrm (+1/-1)
To merge this branch:	bzr merge lp:~gandelman-a/orchestra/lp852250
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
orchestra		2011-09-16	Pending
Review via email: mp+75832@code.launchpad.net

Updated the webdav directory from formulas to charms to accommodate the name change (juju deploy is broken if directory isn't renamed accordingly)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/ubuntu-orchestra-provisioning-server.postinst'
2	--- debian/ubuntu-orchestra-provisioning-server.postinst 2011-09-16 15:07:42 +0000
3	+++ debian/ubuntu-orchestra-provisioning-server.postinst 2011-09-16 23:30:28 +0000
4	@@ -104,7 +104,7 @@
5	# Enable and configure webdav
6	a2enmod dav_fs
7	a2enmod dav
8	- mkdir -p /var/lib/webdav/formulas
9	+ mkdir -p /var/lib/webdav/charms
10	chown -R www-data:www-data /var/lib/webdav/
11	# Need to restart apache to pickup web configs
12	if [ -f /usr/sbin/apache2ctl ]; then
13
14	=== modified file 'debian/ubuntu-orchestra-provisioning-server.postrm'
15	--- debian/ubuntu-orchestra-provisioning-server.postrm 2011-09-16 15:07:42 +0000
16	+++ debian/ubuntu-orchestra-provisioning-server.postrm 2011-09-16 23:30:28 +0000
17	@@ -4,7 +4,7 @@
18
19	# Remove juju storage configuration
20	rm -f /etc/apache2/conf.d/juju_webdav.conf
21	- rm -rf /var/lib/webdav/formulas
22	+ rm -rf /var/lib/webdav/charms
23
24	# Need to restart apache to pickup web configs
25	if [ -f /usr/sbin/apache2ctl ]; then