From d689c13fc89c4c707853d365da4646e60e40df94 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Thu, 19 Mar 2015 19:16:07 +0100
Subject: [PATCH] MT#6557 Move sipwise user creation to ngcp-installer

Also removed sipwise user from 'plain' VM boxes,
it is not necessary there as we use user root in Vagrant.

Change-Id: I84c8ab6b1cd6e9dd7ba94f6871b79bafb153bd4e
---
 deployment.sh | 51 +++++++++++++--------------------------------------
 1 file changed, 13 insertions(+), 38 deletions(-)

diff --git a/deployment.sh b/deployment.sh
index 716b3c6..6a21b1b 100755
--- a/deployment.sh
+++ b/deployment.sh
@@ -1350,17 +1350,6 @@ if "$RETRIEVE_MGMT_CONFIG" && "$RESTART_NETWORK" ; then
   fi # toram
 fi
 
-SIPWISE_HOME="/var/sipwise"
-adduser_sipwise() {
-  if "$NGCP_INSTALLER" ; then
-    adduser_options="--disabled-password"	# NGCP
-  else
-    adduser_options="--disabled-login"		# Debian plain
-  fi
-
-  chroot $TARGET adduser sipwise --gecos "Sipwise" --home ${SIPWISE_HOME} --shell /bin/bash $adduser_options
-}
-
 get_installer_path() {
   if [ -z "$SP_VERSION" ] && ! $TRUNK_VERSION ; then
     INSTALLER=ngcp-installer-latest.deb
@@ -1534,9 +1523,6 @@ EOF
 }
 
 if "$NGCP_INSTALLER" ; then
-  # add sipwise user
-  adduser_sipwise
-
   # set INSTALLER_PATH and INSTALLER depending on release/version
   get_installer_path
 
@@ -1936,40 +1922,29 @@ vagrant_configuration() {
     git clone git://git.mgm.sipwise.com/vmbuilder "${ngcp_vmbuilder}"
   fi
 
-  echo "Adjusting sudo configuration"
-  mkdir -p "${TARGET}/etc/sudoers.d"
-  echo "sipwise ALL=NOPASSWD: ALL" > "${TARGET}/etc/sudoers.d/vagrant"
-  chmod 0440 "${TARGET}/etc/sudoers.d/vagrant"
+  if "$NGCP_INSTALLER" ; then
+    SIPWISE_HOME="/var/sipwise"
 
-  if chroot $TARGET getent passwd | grep '^sipwise' ; then
-    echo "User sipwise exists already, nothing to do"
-  else
-    echo "Adding user sipwise"
-    adduser_sipwise
-  fi
+    # TODO: move PATH adjustment to ngcp-installer (ngcpcfg should have a template here)
+    if ! grep -q '^# Added for Vagrant' "${TARGET}/${SIPWISE_HOME}/.profile" 2>/dev/null ; then
+      echo "Adjusting PATH configuration for user Sipwise"
+      echo "# Added for Vagrant" >> "${TARGET}/${SIPWISE_HOME}/.profile"
+      echo "PATH=\$PATH:/sbin:/usr/sbin" >> "${TARGET}/${SIPWISE_HOME}/.profile"
+    fi
 
-  if grep -q '^# Added for Vagrant' "${TARGET}/${SIPWISE_HOME}/.profile" 2>/dev/null ; then
-    echo "PATH configuration for user Sipwise is already adjusted"
-  else
-    echo "Adjusting PATH configuration for user Sipwise"
-    echo "# Added for Vagrant" >> "${TARGET}/${SIPWISE_HOME}/.profile"
-    echo "PATH=\$PATH:/sbin:/usr/sbin" >> "${TARGET}/${SIPWISE_HOME}/.profile"
+    echo "Adjusting ssh configuration for user sipwise (add Vagrant SSH key)"
+    mkdir -p "${TARGET}/${SIPWISE_HOME}/.ssh/"
+    cat $ngcp_vmbuilder/config/id_rsa_sipwise.pub >> "${TARGET}/${SIPWISE_HOME}/.ssh/authorized_keys"
+    chroot "${TARGET}" chown sipwise:sipwise ${SIPWISE_HOME}/.ssh ${SIPWISE_HOME}/.ssh/authorized_keys
   fi
 
-  echo "Adjusting ssh configuration for user sipwise"
-  mkdir -p "${TARGET}/${SIPWISE_HOME}/.ssh/"
-  cat $ngcp_vmbuilder/config/id_rsa_sipwise.pub >> "${TARGET}/${SIPWISE_HOME}/.ssh/authorized_keys"
-  chroot "${TARGET}" chown sipwise:sipwise ${SIPWISE_HOME}/.ssh ${SIPWISE_HOME}/.ssh/authorized_keys
-
   echo "Adjusting ssh configuration for user root"
   mkdir -p "${TARGET}/root/.ssh/"
   cat $ngcp_vmbuilder/config/id_rsa_sipwise.pub >> "${TARGET}/root/.ssh/authorized_keys"
 
   # see https://github.com/mitchellh/vagrant/issues/1673
   # and https://bugs.launchpad.net/ubuntu/+source/xen-3.1/+bug/1167281
-  if grep -q 'adjusted for Vagrant' "${TARGET}/root/.profile" ; then
-    echo "Workaround for annoying bug 'stdin: is not a tty' Vagrant message seems to be present already"
-  else
+  if ! grep -q 'adjusted for Vagrant' "${TARGET}/root/.profile" ; then
     echo "Adding workaround for annoying bug 'stdin: is not a tty' Vagrant message"
     sed -ri -e "s/mesg\s+n/# adjusted for Vagrant\ntty -s \&\& mesg n/" "${TARGET}/root/.profile"
   fi