Merge lp:~jose/charms/precise/seafile/fixes into lp:charms/seafile

[José Antonio Rey]

Fixing unbound variables and juju log output

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10917-results

review: Needs Fixing (automated testing)

[Adam Israel (aisrael)]

Hi Jose,

I had the opportunity to review this MP today. The failing automated test appears to be availability issues on Azure and AWS, not related to the charm itself.

Following the README, I created a yaml file with the server configuration and deployed it. I did run into an error, however:

2015-01-14 17:44:06 INFO config-changed /var/lib/juju/agents/unit-seafile-0/charm/hooks/config-changed: line 295: server_manual_http: unbound variable

I can send you the complete log if that would be helpful.

review: Needs Fixing

[lp:~jose/charms/precise/seafile/fixes]

8. By José Antonio Rey on 2015-01-14

Fixed problem with an unbound variable

[José Antonio Rey (jose)]

This has been fixed now!

[Adam Israel (aisrael)]

Thanks for the quick fix, José! LGTM, +1

review: Approve

[Charles Butler (lazypower)]

+1 LGTM - merging as this is a prereq for the test merge to resolve a failure case

Thanks for the submission jose

review: Approve

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-05-15 17:15:00 +0000
+++ hooks/config-changed	2015-01-14 18:57:34 +0000
@@ -9,7 +9,7 @@
 default_seahub_db=${TOPDIR}/seahub.db
 PYTHON=`which python`
 
-export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH}
+export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64
 
 use_existing_ccnet="false"
 use_existing_seafile="false"
@@ -206,7 +206,9 @@
 
 function get_seahub_admin_passwd () {
     seahub_admin_passwd=`config-get seahub_admin_passwd`
-    [ -z ${seahub_admin_passwd} ] && seahub_admin_passwd=`pwgen -N1`
+    if [ -z ${seahub_admin_passwd} ]; then
+       seahub_admin_passwd=`pwgen -N1`
+    fi
 }
 
 get_seahub_admin_email;
@@ -251,8 +253,7 @@
 export CCNET_CONF_DIR=$default_ccnet_conf_dir
 export SEAFILE_CONF_DIR=$seafile_data_dir
 
-export PYTHONPATH=${INSTALLPATH}/seafile/lib/python2.6/site-packages:${INSTALLPATH}/seafile/lib64/python2.6/site-packages:${INSTALLPATH}/seahub/thirdpart:$PYTHONPATH
-export PYTHONPATH=${INSTALLPATH}/seafile/lib/python2.7/site-packages:${INSTALLPATH}/seafile/lib64/python2.7/site-packages:$PYTHONPATH
+export PYTHONPATH=${INSTALLPATH}/seafile/lib/python2.6/site-packages:${INSTALLPATH}/seafile/lib64/python2.6/site-packages:${INSTALLPATH}/seahub/thirdpart
 
 manage_py=${INSTALLPATH}/seahub/manage.py
 pushd "${INSTALLPATH}/seahub" 2>/dev/null 1>&2
@@ -282,21 +283,14 @@
 
 sleep 1
 
-juju-log "-----------------------------------------------------------------"
 juju-log "Your seafile server configuration has been finished successfully." 
-juju-log "-----------------------------------------------------------------"
 juju-log "run seafile server:     ./seafile.sh { start | stop | restart }"
 juju-log "run seahub  server:     ./seahub.sh  { start <port> | stop | restart <port> }"
-juju-log "-----------------------------------------------------------------"
 juju-log "If you are behind a firewall, remember to allow input/output of these tcp ports:"
-juju-log "-----------------------------------------------------------------"
 juju-log "port of ccnet server:         ${server_port}"
 juju-log "port of seafile server:       ${seafile_server_port}"
 juju-log "port of seafile httpserver:    ${httpserver_port}"
 juju-log "port of seahub:               ${seahub_port}"
-juju-log "When problems occur, Refer to\n"
-juju-log "      ${server_manual_http}\n"
-juju-log "for information."
 
 currentserver_port=`cat .serverport`
 currentseafile_server_port=`cat .seafileserverport`

=== modified file 'hooks/install'
--- hooks/install	2014-04-15 05:48:58 +0000
+++ hooks/install	2015-01-14 18:57:34 +0000
@@ -16,7 +16,7 @@
 
 
 # Install pre-requisite packages
-apt-get install -y python-software-properties python2.7 python-setuptools python-simplejson python-imaging sqlite3 dnsutils pwgen
+apt-get install -y python-software-properties python2.7 python-setuptools python-simplejson python-imaging sqlite3 dnsutils pwgen python-django
 
 # Install charm-helpers-sh
 apt-add-repository -y ppa:charmers/charm-helpers