Merge pull request #39 from grantma/main

Changes to latest scripts which grommunio is distributing - Fixes issues when apt repos already set up.

Author: crpb

common/dialogs

@@ -94,3 +94,13 @@ get_relayhost(){
   dialog_exit $?
 
 }
+
+apt_already_setup_notice ()
+{
+
+  dialog --no-mouse --colors --clear --backtitle "grommunio Setup" \
+         --title "Apt already setup" \
+	 --msgbox 'It looks like a grommunio apt respository is already defined. Clear these settings, or use the --no-apt-setup flag to run grommunio-setup.' 0 0
+  dialog_exit $?
+
+}

common/repo

@@ -5,6 +5,17 @@
 
 setup_repo() {
     local uri kr count krtemp
+
+    # Check if ther eare already grommunio apt repos defined
+    RELEASE_CODENAME=$(lsb_release -sc)
+    SOURCES_FOUND=0
+    PATTERN='^[^#]+download\.grommunio\.com'
+    [ -e /etc/apt/sources.list ] && grep -qP "$PATTERN" /etc/apt/sources.list && SOURCES_FOUND=1
+    grep -qPr "$PATTERN" /etc/apt/sources.list.d && SOURCES_FOUND=1
+    if [ $SOURCES_FOUND -gt 0 ]; then
+        return 2
+    fi
+
     . /etc/os-release
     mirror=https://download.grommunio.com
     uri="$mirror"/RPM-GPG-KEY-grommunio
@@ -118,4 +129,64 @@ echo
 # keep visual output on the screen for a glimpse so admin can decide
 # if the logfile needs to be inspected.
 sleep 1
+return 0
+}
+
+repos_usage () {
+        echo "$USAGE"  1>&2
+        exit 2
+}
+
+repos_usage_full () {
+        echo "$USAGE"  1>&2
+        echo "" 1>&2
+        echo "    -f        force overwrite" 1>&2
+        echo "    -h        This help" 1>&2
+        exit 2
 }
+
+repos_main () {
+	PROGNAME=`basename "$0"`
+	USAGE="Usage: $PROGNAME [-h]"
+
+	# Process command line arguments
+	OPTIND=1
+	while getopts h F; do
+		case $F in
+		h)
+			repos_usage_full
+			;;
+		\?)
+			repos_usage
+			;;
+		esac
+	done
+	shift $(( OPTIND - 1 ))
+	if [ $# != 0 ]; then
+		repos_usage
+	fi
+
+	# bail out if we are not root
+	if [ "`id -un`" != "root" ] ; then
+		echo 1>&2
+		echo "  `basename $0`: you must be 'root' to run this command." 1>&2
+		echo 1>&2
+		exit 1
+	fi
+
+	setup_repo
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then
+		echo "${PROGNAME}: grommunio apt repository definitions already exist"
+		exit $RETVAL
+	fi
+
+	exit 0
+}
+
+# Execute if stand alone
+case "$0" in
+	*grommunio-setup-repos)
+		repos_main "$@"
+		;;
+esac

etc/grommunio-setup.conf

@@ -0,0 +1,9 @@
+#
+#  grommunio-setup config file
+#
+# Whether to not to set up apt repositories or not
+# Values are 0 for false, and 1 for true
+# Set to 1 if grommunio-setup installed from a deb package as
+# apt probably already set up
+NO_APT_SETUP=0
+

grommunio-setup

@@ -8,7 +8,72 @@
 # Interactive grommunio setup
 
 if [ "$(id -u)" -ne 0 ]; then
-      exec sudo "${BASH_SOURCE[0]}"
+  exec sudo "${BASH_SOURCE[0]}"
+fi
+
+CFG_FILE='/etc/grommunio-setup/grommunio-setup.conf'
+PKGED_CFG_FILE='/etc/grommunio-setup/packaged.conf'
+PROGNAME=`basename "$0"`
+
+# Process command line arguments
+USAGE="Usage: $PROGNAME [-ahx]"
+usage () {
+  echo "$USAGE"  1>&2
+  exit 2
+}
+
+usage_full () {
+  echo "$USAGE"  1>&2
+  echo "" 1>&2
+  echo "    -a    --apt-setup     Set up apt" 1>&2
+  echo "    -h    --help          This help" 1>&2
+  echo "    -x    --no-apt-setup  Don't set up apt" 1>&2
+  echo "" 1>&2
+  exit 2
+}
+
+OPTS=$(getopt -o ahx -l apt-setup,help,no-apt-setup -n "$PROGNAME" -- "$@")
+if [ $? -ne 0 ]; then
+  echo "${PROGNAME}: Failed to parse options." 1>&2
+  exit 2
+fi
+# Reset the positional parameters to the parsed options
+eval set -- "$OPTS"
+
+# setable settings here
+NO_APT_SETUP=0
+[ -e "$CFG_FILE" ] && . "$CFG_FILE"
+# override various settings for packaged setup script
+[ -e "$PKGED_CFG_FILE" ] && . "$PKGED_CFG_FILE"
+# Unsettable settings here
+# Process the options
+while true; do
+  case "$1" in
+    -a | --apt-setup)
+      NO_APT_SETUP=0
+      shift
+      ;;
+    -h | --help)
+      usage_full
+      shift
+      ;;
+    -x | --no-apt-setup)
+      NO_APT_SETUP=1
+      shift
+      ;;
+    --)
+      shift
+      break
+      ;;
+    *)
+      echo "${PROGNAME}: Internal error!"
+      exit 2
+      ;;
+  esac
+done
+
+if [ $# -ne 0 ]; then
+	usage
 fi
 
 export DEBIAN_FRONTEND=noninteractive
@@ -26,9 +91,6 @@ if ! test -e "$LOGFILE"; then
   true >"$LOGFILE"
   chmod 0600 "$LOGFILE"
 fi
-if [ "$1" = "JUSTDOIT" ]; then
-  SKIPDIALOG=1
-fi
 
 apt-get() {
 if [ "$1" = "update" ]; then
@@ -106,17 +168,17 @@ You can abort or delete all data and setup everything from scratch. If so, confi
 \Z1If you continue, ALL data wil be removed!\Z1' \
     0 0 3>&1 1>&2 2>&3)
   dialog_exit $?
-
   if [ "${DELCONFIRM}" != "removealldata" ]; then
     writelog "Aborted deletion after detected existing installation"
     exit 0
 	else
 		writelog "Deleting existing installation after confirmation"
 		echo "drop database grommunio;" | mysql
-		# remove folders
+		# remove folders etc
 		rm -Rf /var/lib/gromox/* \
 			/etc/grommunio-common/ssl/* \
 			/etc/grommunio-common/setup_done \
+			/etc/apt/sources.list.d/grommunio.sources \
 			/var/lib/grommunio-web/*
 
 		# recreate them..
@@ -172,7 +234,15 @@ PACKAGES=(gromox grommunio-admin-api grommunio-admin-web grommunio-index
   grommunio-admin-common grommunio-common grommunio-web grommunio-sync
   grommunio-dav grommunio-dbconf nginx-module-vts)
 . "${DATADIR}/common/repo"
-setup_repo
+if [ $NO_APT_SETUP -eq 0 ]; then
+  setup_repo
+  if [ $? -ne 0 ]; then
+    writelog "Exiting - trying to set up apt repos when already defined"
+    apt_already_setup_notice
+    clear
+    exit 2
+  fi
+fi
 writelog "Installing Grommunio-Packages"
 apt-get update
 # reinstall in case of "removealldata"
@@ -370,8 +440,8 @@ choose_ssl_selfprovided() {
   writelog "Dialog: data for self-provided TLS cert"
   dialog --no-mouse --colors --backtitle "grommunio Setup" --title "TLS certificate (self-provided)" --ok-label "Submit" \
     --form "Enter the paths to the TLS certificates" 0 0 0 \
-    "PEM encoded certificate bundle:  " 1 1 "${SSL_BUNDLE}" 1 35 35 0 \
-    "PEM encoded private key:         " 2 1 "${SSL_KEY}" 2 35 35 0 2>"${TMPF}"
+    "PEM encoded certificate bundle:  " 1 1 "${SSL_BUNDLE}" 1 35 120 0 \
+    "PEM encoded private key:         " 2 1 "${SSL_KEY}" 2 35 120 0 2>"${TMPF}"
   dialog_exit $?
 
 }