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

Proposed by José Antonio Rey on 2014-08-11
Status: Merged
Merged at revision: 28
Proposed branch: lp:~jose/charms/precise/owncloud/update-to-7.0.1
Merge into: lp:charms/owncloud
Diff against target: 44 lines (+6/-3)
3 files modified
config.yaml (+2/-2)
hooks/install (+1/-1)
hooks/upgrade-charm (+3/-0)
To merge this branch: bzr merge lp:~jose/charms/precise/owncloud/update-to-7.0.1
Reviewer Review Type Date Requested Status
Charles Butler (community) 2014-08-11 Approve on 2014-08-11
Review via email: mp+230247@code.launchpad.net

Description of the change

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

To post a comment you must log in.
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) wrote :

+1 LGTM. Thanks for the updates Jose!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-07-26 00:56:18 +0000
3+++ config.yaml 2014-08-11 03:04:40 +0000
4@@ -5,11 +5,11 @@
5 description: the domain name for your owncloud server
6 downloadurl:
7 type: string
8- default: "https://download.owncloud.org/community/owncloud-7.0.0.tar.bz2"
9+ default: "http://download.owncloud.org/community/owncloud-7.0.1.tar.bz2"
10 description: url from which owncloud will be downloaded
11 sha1sum:
12 type: string
13- default: "ae76948275c4598e2db2746d36577fc6b32faeb6"
14+ default: "fb9ec0bdf8aff99321b26a375703fc2c2afe02ae"
15 description: the sha1sum for the file in the download link
16 port:
17 type: int
18
19=== modified file 'hooks/install'
20--- hooks/install 2014-07-21 21:59:37 +0000
21+++ hooks/install 2014-08-11 03:04:40 +0000
22@@ -44,7 +44,7 @@
23
24 chown www-data:www-data -R /var/www/owncloud
25
26-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
27+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
28
29 SRC=`config-get src`
30 echo $SRC > .src
31
32=== modified file 'hooks/upgrade-charm'
33--- hooks/upgrade-charm 2014-06-17 17:56:14 +0000
34+++ hooks/upgrade-charm 2014-08-11 03:04:40 +0000
35@@ -5,6 +5,9 @@
36 # Pause during upgrade
37 hooks/stop
38
39+juju-log "Installing python-yaml"
40+apt-get install python-yaml
41+
42 if [ -f /usr/share/charm-helper/sh/net.sh ]; then
43 #we are under active migration, dont do anything more than once
44 if [ ! -f $CHARM_DIR/.migrating ]; then

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: