From 9122e7b17344dc80710f3a50aa6e8896f9ba8c71 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 17 Oct 2011 14:07:11 -0500
Subject: [PATCH] Set stack user's home dir to DEST
---
stack.sh | 78 ++++++++++++++++++++++++++++----------------------------
1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/stack.sh b/stack.sh
index a7eacbfac1..8e116a98d8 100755
--- a/stack.sh
+++ b/stack.sh
@@ -43,45 +43,6 @@ fi
# Keep track of the current devstack directory.
TOP_DIR=$(cd $(dirname "$0") && pwd)
-# OpenStack is designed to be run as a regular user (Dashboard will fail to run
-# as root, since apache refused to startup serve content from root user). If
-# stack.sh is run as root, it automatically creates a stack user with
-# sudo privileges and runs as that user.
-
-if [[ $EUID -eq 0 ]]; then
- echo "You are running this script as root."
- echo "In 10 seconds, we will create a user 'stack' and run as that user"
- sleep 10
-
- # since this script runs as a normal user, we need to give that user
- # ability to run sudo
- apt-get update
- apt-get install -y sudo
-
- if ! getent passwd stack >/dev/null; then
- echo "Creating a user called stack"
- useradd -U -G sudo -s /bin/bash -m stack
- fi
-
- echo "Giving stack user passwordless sudo priviledges"
- # natty uec images sudoers does not have a '#includedir'. add one.
- grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||
- echo "#includedir /etc/sudoers.d" >> /etc/sudoers
- ( umask 226 && echo "stack ALL=(ALL) NOPASSWD:ALL" \
- > /etc/sudoers.d/50_stack_sh )
-
- echo "Copying files to stack user"
- STACK_DIR="/home/stack/${PWD##*/}"
- cp -r -f "$PWD" "$STACK_DIR"
- chown -R stack "$STACK_DIR"
- if [[ "$SHELL_AFTER_RUN" != "no" ]]; then
- exec su -c "set -e; cd $STACK_DIR; bash stack.sh; bash" stack
- else
- exec su -c "set -e; cd $STACK_DIR; bash stack.sh" stack
- fi
- exit 1
-fi
-
# Settings
# ========
@@ -116,6 +77,45 @@ source ./stackrc
# Destination path for installation ``DEST``
DEST=${DEST:-/opt/stack}
+# OpenStack is designed to be run as a regular user (Dashboard will fail to run
+# as root, since apache refused to startup serve content from root user). If
+# stack.sh is run as root, it automatically creates a stack user with
+# sudo privileges and runs as that user.
+
+if [[ $EUID -eq 0 ]]; then
+ echo "You are running this script as root."
+ echo "In 10 seconds, we will create a user 'stack' and run as that user"
+ sleep 10
+
+ # since this script runs as a normal user, we need to give that user
+ # ability to run sudo
+ apt-get update
+ apt-get install -y sudo
+
+ if ! getent passwd stack >/dev/null; then
+ echo "Creating a user called stack"
+ useradd -U -G sudo -s /bin/bash -d $DEST -m stack
+ fi
+
+ echo "Giving stack user passwordless sudo priviledges"
+ # natty uec images sudoers does not have a '#includedir'. add one.
+ grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||
+ echo "#includedir /etc/sudoers.d" >> /etc/sudoers
+ ( umask 226 && echo "stack ALL=(ALL) NOPASSWD:ALL" \
+ > /etc/sudoers.d/50_stack_sh )
+
+ echo "Copying files to stack user"
+ STACK_DIR="$DEST/${PWD##*/}"
+ cp -r -f "$PWD" "$STACK_DIR"
+ chown -R stack "$STACK_DIR"
+ if [[ "$SHELL_AFTER_RUN" != "no" ]]; then
+ exec su -c "set -e; cd $STACK_DIR; bash stack.sh; bash" stack
+ else
+ exec su -c "set -e; cd $STACK_DIR; bash stack.sh" stack
+ fi
+ exit 1
+fi
+
# Set the destination directories for openstack projects
NOVA_DIR=$DEST/nova
DASH_DIR=$DEST/dash