Juju Charms Collection
seafile package

Merge lp:~jose/charms/precise/seafile/readme-cache-departed into lp:~negronjl/charms/precise/seafile/trunk

  1. Precise Pangolin (12.04)
  2. readme-cache-departed
  3. Merge into trunk
Proposed by José Antonio Rey
Status: Merged
Merged at revision: 5
Proposed branch: lp:~jose/charms/precise/seafile/readme-cache-departed
Merge into: lp:~negronjl/charms/precise/seafile/trunk
Diff against target: 40 lines (+6/-6)
2 files modified
README.md (+3/-3)
hooks/cache-relation-departed (+3/-3)
To merge this branch: bzr merge lp:~jose/charms/precise/seafile/readme-cache-departed
Reviewer Review Type Date Requested Status
Juan L. Negron Approve
Review via email: mp+217170@code.launchpad.net

Description of the change

Added a bit more detail to the README

Fixed some errors in the cache-relation-departed hook

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

LGTM. Thanks Jose

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2014-04-23 01:41:22 +0000
3+++ README.md 2014-04-25 04:21:37 +0000
4@@ -42,9 +42,9 @@
5 hosted at. If you don't know what it is until deployment, you can use
6 `localhost` in the meanwhile, but make sure to change it as soon as you have the
7 domain or uploads will fail.
8- * `server_name`: This server name will be seen by your users by your seafile
9-users. The name should be between 3 and 15 characters long. It's just a server
10-name.
11+ * `server_name`: This server name will be seen by your seafile users. The name
12+should be between 3 and 15 characters long. It can be anything you would like,
13+so let your creativity fly.
14 * `seahub_admin_email`: This is the email address for the main administrator
15 account. It will be used for your login.
16 * `seahub_admin_passwd`: This is the password for the main administrator
17
18=== modified file 'hooks/cache-relation-departed'
19--- hooks/cache-relation-departed 2014-04-23 01:41:22 +0000
20+++ hooks/cache-relation-departed 2014-04-25 04:21:37 +0000
21@@ -2,16 +2,16 @@
22
23 if [ -f .cachehost ]; then
24 juju-log "Removing configuration"
25- sed -i "/\{/d" /opt/seafile/seahub_settings.py
26+ sed -i "/CACHES/d" /opt/seafile/seahub_settings.py
27 sed -i "/default/d" /opt/seafile/seahub_settings.py
28 sed -i "/BACKEND/d" /opt/seafile/seahub_settings.py
29 sed -i "/LOCATION/d" /opt/seafile/seahub_settings.py
30 sed -i "/\}/d" /opt/seafile/seahub_settings.py
31 juju-log "Uninstalling dependency"
32- apt-get remove python-memcache
33+ apt-get remove python-memcache -y
34 fi
35
36-if [ -f .started]
37+if [ -f .started ]; then
38 juju-log "Restarting service"
39 hooks/stop
40 hooks/start

Subscribers

People subscribed via source and target branches