Merge lp:~jose/charms/precise/owncloud/update-to-7.0.1 into lp:charms/owncloud

[José Antonio Rey]

Upgraded default config options to 7.0.1 and fixed a sed path change.

[lp:~jose/charms/precise/owncloud/update-to-7.0.1]

29. By José Antonio Rey on 2014-08-11

Added python-yaml to upgrade-charm since the install hook is not ran in there

[Charles Butler (lazypower)]

+1 LGTM. Thanks for the updates Jose!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-07-26 00:56:18 +0000
+++ config.yaml	2014-08-11 03:04:40 +0000
@@ -5,11 +5,11 @@
     description: the domain name for your owncloud server
   downloadurl:
     type: string
-    default: "https://download.owncloud.org/community/owncloud-7.0.0.tar.bz2"
+    default: "http://download.owncloud.org/community/owncloud-7.0.1.tar.bz2"
     description: url from which owncloud will be downloaded
   sha1sum:
     type: string
-    default: "ae76948275c4598e2db2746d36577fc6b32faeb6"
+    default: "fb9ec0bdf8aff99321b26a375703fc2c2afe02ae"
     description: the sha1sum for the file in the download link
   port:
     type: int

=== modified file 'hooks/install'
--- hooks/install	2014-07-21 21:59:37 +0000
+++ hooks/install	2014-08-11 03:04:40 +0000
@@ -44,7 +44,7 @@
 
 chown www-data:www-data -R /var/www/owncloud
 
-sed -i "s/        \$curlSettings = array(/        \$curlSettings = array(\n            CURLOPT_SSL_VERIFYPEER => 0,\n            CURLOPT_SSL_VERIFYHOST => 0,/" /var/www/owncloud/3rdparty/Sabre/DAV/Client.php
+sed -i "s/        \$curlSettings = array(/        \$curlSettings = array(\n            CURLOPT_SSL_VERIFYPEER => 0,\n            CURLOPT_SSL_VERIFYHOST => 0,/" /var/www/owncloud/3rdparty/sabre/dav/lib/Sabre/DAV/Client.php
 
 SRC=`config-get src`
 echo $SRC > .src

=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2014-06-17 17:56:14 +0000
+++ hooks/upgrade-charm	2014-08-11 03:04:40 +0000
@@ -5,6 +5,9 @@
 # Pause during upgrade
 hooks/stop
 
+juju-log "Installing python-yaml"
+apt-get install python-yaml
+
 if [ -f /usr/share/charm-helper/sh/net.sh ]; then
     #we are under active migration, dont do anything more than once
     if [ ! -f $CHARM_DIR/.migrating ]; then