From d8ba09eb74958e3bbaf61fa0bb02cc09dea799e4 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sun, 15 Feb 2015 16:40:19 +0530
Subject: [PATCH] owncloud: Minor cleanup in action file

---
 actions/owncloud-setup | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/actions/owncloud-setup b/actions/owncloud-setup
index 7dcebb578..1f7d3a58a 100755
--- a/actions/owncloud-setup
+++ b/actions/owncloud-setup
@@ -33,7 +33,7 @@ else
 fi
 
 
-while [ "$1" ] ; do 
+while [ "$1" ] ; do
     arg="$1"
     shift
     case "$arg" in
@@ -43,7 +43,6 @@ while [ "$1" ] ; do
 	    else
 		owncloud_enable=false
 	    fi
-	    export owncloud_enable
 	    ;;
 	status)
 	    printstatus() {
@@ -86,28 +85,12 @@ if [ "$owncloud_enable" != "$owncloud_enable_cur" ] ; then
   'installed'     => false,
 );
 EOF
-# The default admin user and password set up in owncloud
-# FIXME figure out how to pick username and password, perhaps from the
-# plinth user database?
-#adminuser=admin
-#adminpwd=secret
-# Use these in autoconfig.php to set admin username and password:
-#  'adminlogin'    => '$adminuser',
-#  'adminpass'     => '$adminpwd',
-
-	    a2enconf owncloud 2>&1 | logger -t owncloud-setup
-	    service apache2 reload 2>&1 | logger -t owncloud-setup
-
-	    # Initialize application and database tables by visiting
-	    # the front page.  This only work if admin user and
-	    # password was set above.
-	    #wget --quiet http://$(uname -n)/owncloud/index.php
-	else
-	    a2enconf owncloud 2>&1 | logger -t owncloud-setup
-	    service apache2 reload 2>&1 | logger -t owncloud-setup
 	fi
+
+	a2enconf owncloud 2>&1 | logger -t owncloud-setup
     else
 	a2disconf owncloud 2>&1 | logger -t owncloud-setup
-	service apache2 reload 2>&1 | logger -t owncloud-setup
     fi
+
+    service apache2 reload 2>&1 | logger -t owncloud-setup
 fi