Merge lp:~abentley/charms/precise/charmworld/special-users into lp:~juju-jitsu/charms/precise/charmworld/trunk

[Aaron Bentley]

Install as webops_deploy, run as charmworld

Update hooks to install files as webops_deploy, but to run charmworld as the
charmworld user. Log files and branches are written to ~charmworld/var.
nginx is updated to use the new location for static files.

https://codereview.appspot.com/7311060/

[Richard Harding (rharding)]

lgtm just wanted to check on using the new common variables in more
places to prevent too many occurances to change later if needed.

https://codereview.appspot.com/7311060/diff/1/files/nrpe-external-master/check_ingest.sh
File files/nrpe-external-master/check_ingest.sh (right):

https://codereview.appspot.com/7311060/diff/1/files/nrpe-external-master/check_ingest.sh#newcode2
files/nrpe-external-master/check_ingest.sh:2: if [ -f
/home/charmworld/var/ingest-errors ]; then
Should this be set to use the charmworld_home var defined in common?

https://codereview.appspot.com/7311060/diff/1/hooks/config-changed
File hooks/config-changed (right):

https://codereview.appspot.com/7311060/diff/1/hooks/config-changed#newcode82
hooks/config-changed:82: */$interval * * * * charmworld
HOME=/home/charmworld LOGDIR=$log_dir INI=$CONFIG_FILE
~webops_deploy/run-write-errors $log_dir/ingest-errors
$project_dir/scripts/ingest
again should this use the variable defined for charmworkd_home like the
log_dir variable?

https://codereview.appspot.com/7311060/diff/1/hooks/config-changed#newcode83
hooks/config-changed:83: @daily charmworld HOME=/home/webops_deploy
INI=$project_dir/production.ini $project_dir/bin/python
$project_dir/charmworld/jobs/cstat.py
and webops_home here.

https://codereview.appspot.com/7311060/

[Curtis Hovey (sinzui)]

Thank you Aaron, lgtm.

I don't have any comment about the mechanical changes in in the diff. I
was surprised to see the "-R" option following the positional args to
chown in a few places (they pre-exist your change). I was surprised. I
used to reading the options before what might be a long of positional
args.

https://codereview.appspot.com/7311060/

=== modified file 'common'
--- common	2013-01-29 15:32:47 +0000
+++ common	2013-02-07 21:17:21 +0000
@@ -1,4 +1,7 @@
-project_dir="/home/ubuntu/charmworld"
+webops_home="/home/webops_deploy"
+charmworld_home="/home/charmworld"
+log_dir="$charmworld_home/var"
+project_dir="$webops_home/charmworld"
 CONFIG_FILE="$project_dir/production.ini"
 configure(){
   ./write_config.py $project_dir/default.ini production_overrides.ini\

=== modified file 'files/nrpe-external-master/check_ingest.sh'
--- files/nrpe-external-master/check_ingest.sh	2013-01-31 20:03:15 +0000
+++ files/nrpe-external-master/check_ingest.sh	2013-02-07 21:17:21 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -f /home/ubuntu/var/ingest-errors ]; then
+if [ -f /home/charmworld/var/ingest-errors ]; then
     echo Charmworld ingest failing
     exit 1
 fi

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2013-01-31 21:28:17 +0000
+++ hooks/config-changed	2013-02-07 21:17:21 +0000
@@ -36,7 +36,7 @@
     cd $old_dir
     configure
     cd $project_dir
-    chown ubuntu.ubuntu . -R
+    chown webops_deploy.webops_deploy . -R
     if grep -E 'mongo.host = .+' $CONFIG_FILE; then
         INI=$CONFIG_FILE bin/migrations upgrade
         cd $old_dir
@@ -79,8 +79,8 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 $mailto
 
-*/$interval * * * * ubuntu HOME=/home/ubuntu INI=$CONFIG_FILE ~ubuntu/run-write-errors /home/ubuntu/var/ingest-errors $project_dir/scripts/ingest
-@daily ubuntu HOME=/home/ubuntu INI=$project_dir/production.ini $project_dir/bin/python $project_dir/charmworld/jobs/cstat.py
+*/$interval * * * * charmworld HOME=/home/charmworld LOGDIR=$log_dir INI=$CONFIG_FILE ~webops_deploy/run-write-errors $log_dir/ingest-errors $project_dir/scripts/ingest
+@daily charmworld HOME=/home/webops_deploy INI=$project_dir/production.ini $project_dir/bin/python $project_dir/charmworld/jobs/cstat.py
 
 EOF
 

=== modified file 'hooks/database-relation-changed'
--- hooks/database-relation-changed	2013-01-28 21:23:17 +0000
+++ hooks/database-relation-changed	2013-02-07 21:17:21 +0000
@@ -4,7 +4,7 @@
 set -x
 
 DB_HOST=`relation-get private-address`
-HOME=/home/ubuntu
+HOME=$webops_home
 
 if [ -z "$DB_HOST" ]; then
     juju-log "Waiting for handshake from mongodb"
@@ -20,12 +20,13 @@
 
 configure $DB_HOST $DB_PORT
 
-INI=$CONFIG_FILE $project_dir/bin/migrations upgrade --init
+su charmworld -c "export INI=$CONFIG_FILE; $project_dir/bin/migrations upgrade --init"
 
 juju-log "Hey, we're ingesting over here. This WILL take a while."
 # Perform an initial ingest
-su ubuntu -c "INI=$CONFIG_FILE HOME=/home/ubuntu/ \
-  PYTHON_BIN=$project_dir/bin/python /home/ubuntu/charmworld/scripts/ingest"
+su charmworld -c "INI=$CONFIG_FILE HOME=$charmworld_home \
+  LOGDIR=$log_dir PYTHON_BIN=$project_dir/bin/python \
+  $project_dir/scripts/ingest"
 
 open-port 80
 

=== modified file 'hooks/install'
--- hooks/install	2013-01-31 21:28:17 +0000
+++ hooks/install	2013-02-07 21:17:21 +0000
@@ -1,5 +1,7 @@
 #!/bin/bash
-set -eux
+set -eu
+source common
+set -x
 
 # This PPA is no longer required. Remove for all running charms upgrading to
 # current status. #rev 15
@@ -15,7 +17,20 @@
 echo '/(.*)@charmworld-instance/	charmworld-instance+${1}@canonical.com' > /etc/postfix/canonical
 postmap /etc/postfix/canonical
 postfix reload
-mkdir -p ~ubuntu/var/charms
-chown -R ubuntu.ubuntu ~ubuntu/var
-install -o ubuntu -g ubuntu scripts/run-write-errors ~ubuntu
+ensure_user(){
+    set +e
+    useradd --create-home $1
+    result=$?
+    if [ $result -ne 0 -a $result -ne 9 ]; then
+        exit $result
+    fi
+    set -e
+}
+ensure_user webops_deploy
+ensure_user charmworld
+INSTALL="install -o webops_deploy -g webops_deploy"
+# both var and var/charms need to be writable by charmworld.
+install -o charmworld -g charmworld -m 0755 -d $charmworld_home/var
+install -o charmworld -g charmworld -m 0755 -d $charmworld_home/var/charms
+$INSTALL scripts/run-write-errors $webops_home
 python scripts/gen_deploymgr.py

=== modified file 'hooks/start'
--- hooks/start	2013-01-16 16:05:49 +0000
+++ hooks/start	2013-02-07 21:17:21 +0000
@@ -5,7 +5,7 @@
 
 if [ -f "$project_dir/scripts/run" ]; then
     cd $project_dir
-    HOME=/home/ubuntu INI=$CONFIG_FILE scripts/run
+    su charmworld -c "HOME=$charmworld_home PROJECT_DIR=$project_dir INI=$CONFIG_FILE scripts/run"
     # This will restart Nginx which we'll probably want to do
-    HOME=/home/ubuntu scripts/clear-cache
+    scripts/clear-cache
 fi

=== modified file 'hooks/stop'
--- hooks/stop	2013-01-08 20:40:10 +0000
+++ hooks/stop	2013-02-07 21:17:21 +0000
@@ -1,7 +1,10 @@
 #!/bin/bash
-set -eux
+set -eu
+source common
+set -x
 
-if [ -f "/home/ubuntu/charmworld/scripts/stop" ]; then
-	cd /home/ubuntu/charmworld
-	HOME=/home/ubuntu scripts/stop
+stop_script="$project_dir/scripts/stop"
+if [ -f "$stop_script" ]; then
+    cd $project_dir
+    su charmworld -c "HOME=$charmworld_home PROJECT_DIR=$project_dir $stop_script"
 fi

=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2013-01-30 20:34:57 +0000
+++ hooks/upgrade-charm	2013-02-07 21:17:21 +0000
@@ -1,15 +1,15 @@
 #!/bin/bash
 set -eux
 
-HOME=/home/ubuntu
-
 hooks/stop || true
 hooks/install
-if [ -d $HOME/.launchpadlib ]; then
-    chown -R ubuntu.ubuntu $HOME/.launchpadlib;
-fi
+maybe_rm(){
+  if [ -d $1 ]; then
+      rm $1 -R
+  fi
+}
+maybe_rm ~ubuntu/charmworld
+maybe_rm ~ubuntu/var
 hooks/config-changed
 hooks/restart
-if [ -f $HOME/shhh.py ]; then
-    rm $HOME/shhh.py
-fi
+maybe_rm ~ubuntu/shhh.py

=== modified file 'nginx/http'
--- nginx/http	2013-01-21 20:38:02 +0000
+++ nginx/http	2013-02-07 21:17:21 +0000
@@ -40,7 +40,7 @@
         location /static {
            gzip on;
            expires 48h;
-           alias /home/ubuntu/charmworld/charmworld/static;
+           alias /home/webops_deploy/charmworld/charmworld/static;
         }
 
         location / {

=== modified file 'production_overrides.ini'
--- production_overrides.ini	2013-01-28 21:23:17 +0000
+++ production_overrides.ini	2013-02-07 21:17:21 +0000
@@ -32,7 +32,7 @@
 
 [handler_filelog]
 class = FileHandler
-args = ('/home/ubuntu/var/app.log', 'a')
+args = ('/home/charmworld/var/app.log', 'a')
 level = INFO
 formatter = generic
 

=== modified file 'revision'
--- revision	2013-02-04 17:13:16 +0000
+++ revision	2013-02-07 21:17:21 +0000
@@ -1,1 +1,1 @@
-20
+21

=== modified file 'scripts/gen_deploymgr.py'
--- scripts/gen_deploymgr.py	2013-01-31 20:38:24 +0000
+++ scripts/gen_deploymgr.py	2013-02-07 21:17:21 +0000
@@ -1,9 +1,15 @@
 #!/usr/bin/env python
-from os import chmod
-from os import makedirs
+from os import (
+    chmod,
+    fchmod,
+    chown,
+    fchown,
+    makedirs,
+    )
 from os.path import abspath
 from os.path import dirname
 from os.path import exists
+from pwd import getpwnam
 from string import Template
 
 
@@ -18,6 +24,7 @@
     if not exists(directory):
         makedirs(directory)
         chmod(directory, 0755)
+        chown(directory, WEBOPS_UID, WEBOPS_GID)
 
 
 def write_deploymgr():
@@ -26,12 +33,13 @@
         rendered = template.substitute({
             'charm_dir': CHARM_DIR
         })
-
         with open(DEPLOYMGR_OUT, 'w') as output:
+            fchown(output.fileno(), WEBOPS_UID, WEBOPS_GID)
+            fchmod(output.fileno(), 0755)
             output.writelines(rendered)
-    chmod(DEPLOYMGR_OUT, 0755)
 
 
 if __name__ == "__main__":
+    WEBOPS_UID, WEBOPS_GID = getpwnam('webops_deploy')[2:4]
     prep_output_path(DEPLOYMGR_OUT)
     write_deploymgr()