Merge lp:~ev/charms/precise/daisy/prodstack-prep into lp:~daisy-pluckers/charms/precise/daisy/trunk

[Evan]

=== modified file 'config.yaml'
--- config.yaml	2012-11-13 14:23:41 +0000
+++ config.yaml	2013-02-22 17:25:28 +0000
@@ -1,4 +1,32 @@
 options:
+  basedir:
+      default: "daisy.ubuntu.com"
+      type: string
+      description: Base directory for code
+  instance_type:
+      default: "production"
+      type: string
+      description: Instance type
+  user_code_runner:
+      default: "whoopsie"
+      type: string
+      description: The user that runs the code
+  group_code_runner:
+      default: "whoopsie"
+      type: string
+      description: The group that runs the code
+  user_code_owner:
+      default: "webops_deploy"
+      type: string
+      description: The user that owns the code
+  group_code_owner:
+      default: "webops_deploy"
+      type: string
+      description: The group that owns the code
+  listen_port:
+      default: 8080
+      type: int
+      description: Port for the application to listen on
   amqp-user:
       type: string
       default: 'daisy'
@@ -15,11 +43,60 @@
       type: string
       default: ''
       description: The AWS access key (EC2_ACCESS_KEY).
-  daisy-ec2-host:
+  daisy-s3-host:
       type: string
       default: ''
-      description: The EC2 IP address.
-  daisy-ec2-bucket:
+      description: The S3 IP address.
+  daisy-s3-bucket:
       type: string
       default: 'daisy_core_files'
-      description: The EC2 bucket.
+      description: The S3 bucket.
+  daisy-openstack-auth-url:
+      type: string
+      default: ''
+      description: |
+        The OpenStack authentication URL, e.g.:
+        https://keystone.yourdomain.com:443/v2.0/
+  daisy-openstack-username:
+      type: string
+      default: ''
+      description: The OpenStack username to authenticate with.
+  daisy-openstack-password:
+      type: string
+      default: ''
+      description: The OpenStack password to authenticate with.
+  daisy-openstack-tenant:
+      type: string
+      default: ''
+      description: |
+        The OpenStack tenant to use, e.g.: yourname_project.
+  daisy-openstack-region:
+      type: string
+      default: ''
+      description: The OpenStack region to use.
+  daisy-swift-bucket:
+      type: string
+      default: ''
+      description: |
+        The OpenStack Swift bucket to use, e.g.: daisy_core_files.
+        Setting this will use Swift instead of S3 for storing core files.
+  daisy-cassandra-host:
+      type: string
+      default: ''
+      description: |
+        Override relations to Cassandra with a specific host address. This
+        is a temporary measure until cross-environment relations are ready.
+  daisy-cassandra-username:
+      type: string
+      default: ''
+      description: |
+        The Cassandra RPC username. Leave blank if one is not needed.
+  daisy-cassandra-password:
+      type: string
+      default: ''
+      description: |
+        The Cassandra RPC password. Leave blank if one is not needed.
+  repository:
+      type: string
+      default: 'ppa:daisy-pluckers/prodstack-prep'
+      description: The location for the daisy-dependencies package.

=== added directory 'files'
=== renamed file 'hooks/relation-changed' => 'hooks/amqp'
--- hooks/relation-changed	2012-11-15 16:13:30 +0000
+++ hooks/amqp	2013-02-22 17:25:28 +0000
@@ -2,8 +2,6 @@
 
 . $(dirname $0)/common
 
-config=/var/www/daisy/local_config.py
-
 get_rabbit_settings () {
     local rabbit_user="$(config-get amqp-user)"
     local rabbit_vhost="$(config-get amqp-vhost)"
@@ -24,20 +22,9 @@
     save_setting amqp_username "$rabbit_user"
     save_setting amqp_password "$rabbit_password"
     save_setting amqp_vhost "$rabbit_vhost"
-}
 
-save_cassandra_settings () {
-    cassandrahost="$(relation-get private-address)"
-    if ! grep -qs 'cassandra_hosts' $config; then
-        echo "cassandra_hosts = ['$cassandrahost']" >> $config
-    else
-        sed -i "s,cassandra_hosts = .*,cassandra_hosts = ['$cassandrahost']," $config
-    fi
-    if "$(dirname $0)/create-keyspace" "$cassandrahost"; then
-        OOPS_KEYSPACE=crashdb OOPS_HOST="$cassandrahost" python \
-            /usr/share/pyshared/oopsrepository/schema.py
-        PYTHONPATH=/var/www/daisy python /var/www/daisy/schema.py
-    fi
+    # Tell the WSGI server to reload, since we've modified $LOCAL_CONFIG_PATH.
+    wsgi_reload
 }
 
 COMMAND="$(basename $0)"
@@ -49,9 +36,6 @@
     amqp-relation-changed)
         save_rabbit_settings
         ;;
-    db-relation-changed)
-        save_cassandra_settings
-        ;;
     *)
         juju-log "Command not recognized"
         ;;

=== modified symlink 'hooks/amqp-relation-changed'
=== target changed u'relation-changed' => u'amqp'
=== modified symlink 'hooks/amqp-relation-joined'
=== target changed u'relation-changed' => u'amqp'
=== added file 'hooks/cassandra'
--- hooks/cassandra	1970-01-01 00:00:00 +0000
+++ hooks/cassandra	2013-02-22 17:25:28 +0000
@@ -0,0 +1,56 @@
+#!/bin/sh -eux
+
+. $(dirname $0)/common
+
+address="$(relation-get private-address)"
+COMMAND="$(basename $0)"
+
+if [ -n "$(config-get daisy-cassandra-host)" ]; then
+    juju-log "A Cassandra host has been manually set. Ignoring the relation."
+    exit 0
+fi
+
+if [ -z "$address" ] && [ $COMMAND != "db-relation-broken" ]; then
+    juju-log "No address provided."
+    exit 0
+fi
+
+if [ "$COMMAND" = "db-relation-departed" ]; then
+    # First remove the address that just departed the relation, then remove the
+    # trailing comma from the list, if one exists.
+    sed -i -e "s|\(cassandra_hosts = .*\)'$address'[, ]*|\1|" \
+           -e "s|, ]|]|" $LOCAL_CONFIG_PATH
+
+elif [ "$COMMAND" = "db-relation-joined" ]; then
+    p="$LOCAL_CONFIG_PATH"
+
+    if ! grep -qs 'cassandra_hosts =' $p; then
+        # We do not have a cassandra_hosts variable. Set one with a new list.
+        echo "cassandra_hosts = ['$address']" >> $p
+
+    elif grep -qs "cassandra_hosts =.*']" $p; then
+        # We already have at least one host. Put the new host on the end of the
+        # list.
+        sed -i "s|\(cassandra_hosts.*\)]|\1, '$address']|" $p
+
+    elif grep -qs "cassandra_hosts =.*\[[ *]*\]" $p; then
+        # We have no hosts. Replace the entire line with a new single-element
+        # list.
+        sed -i "s|cassandra_hosts =.*|cassandra_hosts = ['$address']|" $p
+    fi
+
+    if "$(dirname $0)/create-keyspace" "$address"; then
+        OOPS_KEYSPACE=crashdb OOPS_HOST="$address" python \
+            /usr/share/pyshared/oopsrepository/schema.py
+        PYTHONPATH=$LOCAL_CONFIG_LOCATION:$CODE_LOCATION python \
+            $CODE_LOCATION/daisy/schema.py
+    fi
+
+elif [ "$COMMAND" = "db-relation-broken" ]; then
+    sed -i "s|cassandra_hosts =.*|cassandra_hosts = []|" $LOCAL_CONFIG_PATH
+fi
+
+# Tell the WSGI server to reload, since we've modified $LOCAL_CONFIG_PATH.
+wsgi_reload
+
+exit 0

=== modified file 'hooks/common'
--- hooks/common	2012-10-10 10:45:43 +0000
+++ hooks/common	2013-02-22 17:25:28 +0000
@@ -1,13 +1,52 @@
 #!/bin/sh
 
-config=/var/www/daisy/local_config.py
+BASEDIR="$(config-get basedir)"
+INSTANCE_TYPE="$(config-get instance_type)"
+USER_CODE_OWNER=$(config-get user_code_owner)
+GROUP_CODE_OWNER=$(config-get group_code_owner)
+USER_CODE_RUNNER=$(config-get user_code_runner)
+GROUP_CODE_RUNNER=$(config-get group_code_runner)
+DEPLOY_ROOT="/srv/$BASEDIR/$INSTANCE_TYPE"
+CODE_LOCATION="$DEPLOY_ROOT/daisy"
+LOCAL_CONFIG_LOCATION="$DEPLOY_ROOT/local_config"
+LOCAL_CONFIG_PATH="$LOCAL_CONFIG_LOCATION/local_config.py"
+OOPS_LOCAL="$DEPLOY_ROOT/oops-local"
+LISTEN_PORT="$(config-get listen_port)"
+LOG_DIR="/srv/$BASEDIR/$INSTANCE_TYPE-logs"
 
 save_setting () {
     key="$1"
     value="$2"
-    if ! grep -qs "$key" $config; then
-        echo "$key = '$value'" >> $config
-    else
-        sed -i "s,$key = .*,$key = '$value'," $config
-    fi
+    if ! grep -qs "$key" $LOCAL_CONFIG_PATH; then
+        echo "$key = '$value'" >> $LOCAL_CONFIG_PATH
+    else
+        sed -i "s,$key = .*,$key = '$value'," $LOCAL_CONFIG_PATH
+    fi
+}
+
+save_cassandra () {
+    value="$1"
+    if ! grep -qs "cassandra_hosts" $LOCAL_CONFIG_PATH; then
+        echo "cassandra_hosts = ['$value']" >> $LOCAL_CONFIG_PATH
+    else
+        sed -i "s,cassandra_hosts = .*,cassandra_hosts = ['$value']," \
+            $LOCAL_CONFIG_PATH
+    fi
+}
+
+add_user () {
+    local user="$1"
+    local group="$2"
+    id $user 2>/dev/null || adduser --quiet --system --disabled-password --ingroup $group $user
+}
+
+add_group () {
+    local group="$1"
+    getent group | grep -qs "^$group:" || addgroup --quiet "$group"
+}
+
+wsgi_reload () {
+    for relid in $(relation-ids wsgi-file); do
+        relation-set -r $relid wsgi_timestamp=$(date +%s)
+    done
 }

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-10-10 09:35:32 +0000
+++ hooks/config-changed	2013-02-22 17:25:28 +0000
@@ -2,12 +2,36 @@
 
 . $(dirname $0)/common
 
+cassandra_host="$(config-get daisy-cassandra-host)"
+
+swift_bucket="$(config-get daisy-swift-bucket)"
+os_auth_url="$(config-get daisy-openstack-auth-url)"
+os_username="$(config-get daisy-openstack-username)"
+os_password="$(config-get daisy-openstack-password)"
+os_tenant="$(config-get daisy-openstack-tenant)"
+os_region="$(config-get daisy-openstack-region)"
+[ -n "$swift_bucket" ] && save_setting swift_bucket "$swift_bucket"
+[ -n "$os_auth_url" ] && save_setting os_auth_url "$os_auth_url"
+[ -n "$os_username" ] && save_setting os_username "$os_username"
+[ -n "$os_password" ] && save_setting os_password "$os_password"
+[ -n "$os_tenant" ] && save_setting os_tenant_name "$os_tenant"
+[ -n "$os_region" ] && save_setting os_region_name "$os_region"
+
 aws_secret_key="$(config-get daisy-aws-secret-key)"
 aws_access_key="$(config-get daisy-aws-access-key)"
-ec2_host="$(config-get daisy-ec2-host)"
-ec2_bucket="$(config-get daisy-ec2-bucket)"
-
+ec2_host="$(config-get daisy-s3-host)"
+ec2_bucket="$(config-get daisy-s3-bucket)"
 [ -n "$aws_secret_key" ] && save_setting aws_secret_key "$aws_secret_key"
 [ -n "$aws_access_key" ] && save_setting aws_access_key "$aws_access_key"
 [ -n "$ec2_host" ] && save_setting ec2_host "$ec2_host"
 [ -n "$ec2_bucket" ] && save_setting ec2_bucket "$ec2_bucket"
+
+# If the user has set daisy-cassandra-host to null, set cassandra_hosts back to
+# an empty list.
+[ -n "$cassandra_host" ] && save_cassandra "$cassandra_host" #|| \
+    #sed -i "s|cassandra_hosts =.*|cassandra_hosts = []|" $LOCAL_CONFIG_PATH
+
+# Tell the WSGI server to reload, since we've modified $LOCAL_CONFIG_PATH.
+wsgi_reload
+
+exit 0

=== added file 'hooks/daisy-relation-changed'
--- hooks/daisy-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/daisy-relation-changed	2013-02-22 17:25:28 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh -eux
+
+. hooks/common
+
+hostname="$(unit-get private-address)"
+juju-log "Setting website URL to $hostname:$LISTEN_PORT"
+relation-set port=$LISTEN_PORT hostname=$hostname

=== added symlink 'hooks/daisy-relation-joined'
=== target is u'daisy-relation-changed'
=== added symlink 'hooks/db-relation-broken'
=== target is u'cassandra'
=== removed symlink 'hooks/db-relation-changed'
=== target was u'relation-changed'
=== added symlink 'hooks/db-relation-departed'
=== target is u'cassandra'
=== added symlink 'hooks/db-relation-joined'
=== target is u'cassandra'
=== modified file 'hooks/install'
--- hooks/install	2012-11-15 12:26:48 +0000
+++ hooks/install	2013-02-22 17:25:28 +0000
@@ -1,32 +1,44 @@
 #!/bin/sh
 set -eux
-sudo add-apt-repository ppa:ev/whoopsie-daisy
-apt-get update
-DEBCONF_FRONTEND=noninteractive apt-get -y install daisy-dependencies
-# Enable mod_rewrite.
-a2enmod rewrite
-[ -e /srv/local-oopses-whoopsie ] || mkdir /srv/local-oopses-whoopsie
-chown www-data:users /srv/local-oopses-whoopsie
-cat > /etc/apache2/sites-enabled/000-default << EOF
-<VirtualHost *:80>
-	ServerAdmin webmaster@localhost
-
-	DocumentRoot /var/www/daisy
-	WSGIDaemonProcess localhost python-path=/var/www/daisy:/var/www
-	WSGIProcessGroup localhost
-	WSGIApplicationGroup localhost
-	WSGIScriptAlias / /var/www/daisy/submit.wsgi
-	RewriteEngine on
-	RewriteRule ^/([^/]+)/submit-core/([^/]+)/([^/]+) /submit_core.wsgi?uuid=\$1&arch=\$2&systemuuid=\$3 [L]
-	<Directory /var/www/daisy>
-		SetHandler wsgi-script
-	</Directory>
-	ErrorLog /var/log/apache2/error.log
-	LogLevel warn
-	CustomLog /var/log/apache2/access.log combined
-</VirtualHost>
-EOF
-[ -e /var/www/daisy ] || bzr branch lp:~ev/daisy/s3 /var/www/daisy
-/etc/init.d/apache2 restart
-
-cp /var/www/daisy/configuration.py /var/www/daisy/local_config.py
+
+. hooks/common
+
+sudo apt-add-repository "$(config-get repository)"
+sudo apt-get update
+DEBCONF_FRONTEND=noninteractive sudo apt-get -y install daisy-dependencies
+
+# Create groups
+add_group "$GROUP_CODE_OWNER"
+add_group "$GROUP_CODE_RUNNER"
+
+# Create users
+add_user "$USER_CODE_OWNER" "$GROUP_CODE_OWNER"
+add_user "$USER_CODE_RUNNER" "$GROUP_CODE_RUNNER"
+
+# Create directories
+mkdir -p "$CODE_LOCATION" "$LOCAL_CONFIG_LOCATION" "$OOPS_LOCAL" "$LOG_DIR"
+
+# Unpack tarred Daisy code
+charm_dir="$(pwd)"
+tarball="$charm_dir/files/daisy.tgz"
+
+if [ -f "$tarball" ]; then
+    tar -C "$CODE_LOCATION" -xvf "$tarball"
+fi
+
+if [ ! -e "$LOCAL_CONFIG_PATH" ]; then
+    cp "$CODE_LOCATION/daisy/configuration.py" "$LOCAL_CONFIG_PATH"
+fi
+
+# Reset the Cassandra hosts setting. This may have been established by a
+# previous charm, but its contents are now invalid until the config-changed or
+# db-relation-* hooks fires. Its default value of 127.0.0.1 would persist
+# across db-relation-joined and db-relation-departed calls if left set.
+sed -i "s|cassandra_hosts =.*|cassandra_hosts = []|" "$LOCAL_CONFIG_PATH"
+
+save_setting "oops_repository" "$OOPS_LOCAL"
+
+chown -R $USER_CODE_OWNER:$USER_CODE_RUNNER "/srv/$BASEDIR"
+chown -R $USER_CODE_RUNNER:$GROUP_CODE_RUNNER "$OOPS_LOCAL"
+
+exit 0

=== added file 'hooks/wsgi-file-relation-changed'
--- hooks/wsgi-file-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/wsgi-file-relation-changed	2013-02-22 17:25:28 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh -eux
+
+. hooks/common
+
+set +u
+RID="$1"
+set -u
+OPTION=
+
+if [ -n "$RID" ]; then
+    OPTION="-r $RID"
+fi
+
+relation-set $OPTION working_dir=$CODE_LOCATION
+relation-set $OPTION python_path="$CODE_LOCATION:$LOCAL_CONFIG_LOCATION"
+relation-set $OPTION wsgi_worker_class='gevent_wsgi'
+relation-set $OPTION wsgi_user="$USER_CODE_RUNNER"
+relation-set $OPTION wsgi_group="$GROUP_CODE_RUNNER"
+relation-set $OPTION port="$LISTEN_PORT"
+relation-set $OPTION wsgi_access_logfile="$LOG_DIR/daisy-access.log"
+relation-set $OPTION wsgi_extra="'--error-logfile=$LOG_DIR/daisy-error.log',"
+relation-set $OPTION wsgi_wsgi_file='daisy.wsgi:application'

=== added symlink 'hooks/wsgi-file-relation-joined'
=== target is u'wsgi-file-relation-changed'
=== modified file 'metadata.yaml'
--- metadata.yaml	2012-10-05 13:32:03 +0000
+++ metadata.yaml	2013-02-22 17:25:28 +0000
@@ -1,8 +1,15 @@
 name: daisy
-summary: "Daisy error reporting server"
+summary: "Daisy for the Ubuntu Error Tracker"
 description: |
-    Installs the Daisy error reporting server for Ubuntu, relates to Cassandra
-    and RabbitMQ.
+    Deploys the Daisy component of the Ubuntu Error Tracker. Daisy is
+    responsible for receiving error reports from Ubuntu systems and writing
+    them into a Cassandra database.
+provides:
+    wsgi-file:
+        interface: wsgi
+        scope: container
+    daisy:
+        interface: http
 requires:
     db:
         interface: cassandra

=== modified file 'revision'
--- revision	2012-11-27 18:15:51 +0000
+++ revision	2013-02-22 17:25:28 +0000
@@ -1,1 +1,1 @@
-92
+146