Merge lp:~jose/charms/precise/seafile/add-set--eux into lp:~negronjl/charms/precise/seafile/trunk

Proposed by José Antonio Rey
Status: Merged
Merged at revision: 6
Proposed branch: lp:~jose/charms/precise/seafile/add-set--eux
Merge into: lp:~negronjl/charms/precise/seafile/trunk
Diff against target: 50 lines (+7/-6)
4 files modified
hooks/cache-relation-departed (+2/-0)
hooks/config-changed (+2/-0)
hooks/stop (+0/-3)
hooks/website-relation-changed (+3/-3)
To merge this branch: bzr merge lp:~jose/charms/precise/seafile/add-set--eux
Reviewer Review Type Date Requested Status
Juan L. Negron Approve
Review via email: mp+219736@code.launchpad.net

Description of the change

Added 'set -eux' flags as a CS requirement.

To post a comment you must log in.
Revision history for this message
Juan L. Negron (negronjl) wrote :

LGTM. Approved. Merging.

-Juan

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/cache-relation-departed'
2--- hooks/cache-relation-departed 2014-04-25 04:18:25 +0000
3+++ hooks/cache-relation-departed 2014-05-15 17:23:27 +0000
4@@ -1,5 +1,7 @@
5 #!/bin/bash
6
7+set -eux
8+
9 if [ -f .cachehost ]; then
10 juju-log "Removing configuration"
11 sed -i "/CACHES/d" /opt/seafile/seahub_settings.py
12
13=== modified file 'hooks/config-changed'
14--- hooks/config-changed 2014-04-15 05:48:58 +0000
15+++ hooks/config-changed 2014-05-15 17:23:27 +0000
16@@ -1,5 +1,7 @@
17 #!/bin/bash
18
19+set -eux
20+
21 TOPDIR="/opt/seafile"
22 INSTALLPATH="${TOPDIR}/seafile-server-latest"
23 default_ccnet_conf_dir=${TOPDIR}/ccnet
24
25=== modified file 'hooks/stop'
26--- hooks/stop 2014-04-15 05:48:58 +0000
27+++ hooks/stop 2014-05-15 17:23:27 +0000
28@@ -1,7 +1,4 @@
29 #!/bin/bash
30-# Here put anything that is needed to stop the service.
31-# Note that currently this is run directly after install
32-# i.e. 'service apache2 stop'
33
34 set -eux
35
36
37=== modified file 'hooks/website-relation-changed'
38--- hooks/website-relation-changed 2014-04-23 01:41:22 +0000
39+++ hooks/website-relation-changed 2014-05-15 17:23:27 +0000
40@@ -1,7 +1,7 @@
41 #!/bin/bash
42-# This must be renamed to the name of the relation. The goal here is to
43-# affect any change needed by relationships being formed, modified, or broken
44-# This script should be idempotent.
45+
46+set -eux
47+
48 juju-log $JUJU_REMOTE_UNIT modified its settings
49 juju-log Relation settings:
50 relation-get

Subscribers

People subscribed via source and target branches