Merge lp:~teknico/charms/precise/discourse/add-cheetah-pkg-misc-fixes into lp:~marcoceppi/charms/precise/discourse/trunk

[Nicola Larosa]

1) Add the python-cheetah package to the packages installed by the install hook.

2) Fix removal of existing conf file in the install hook.

3) Misc. fixes to typos in comments and strings.

Note: this incorporates and improves the fix proposed in the lp:~george-edison55/charms/precise/discourse/trunk branch (point #2 above).

Unmerged revisions

47. By Nicola Larosa on 2013-07-09

Add the python-cheetah package to the installed ones in hooks/install, and fix typos in code and comments.

=== modified file 'README.md'
--- README.md	2013-05-29 23:47:47 +0000
+++ README.md	2013-07-11 16:56:24 +0000
@@ -74,7 +74,7 @@
 is pointed at the latest version of Discourse.
 
 For production deployments of Discourse it's recommended you change this version
-either during deployment or shortly after to the corrosponding [release](https://github.com/discourse/discourse/tags)
+either during deployment or shortly after to the corresponding [release](https://github.com/discourse/discourse/tags)
 of Discourse you deployed. Doing so will ensure that during scale-out you'll
 maintain the same version of Discourse between units. Failure to do so may
 result in broken behavior due to version inconsistency between units.

=== modified file 'contrib/nginx/discourse'
--- contrib/nginx/discourse	2013-05-29 23:29:41 +0000
+++ contrib/nginx/discourse	2013-07-11 16:56:24 +0000
@@ -44,7 +44,7 @@
     proxy_set_header Host $http_host;
 
     # If the file exists as a static file serve it directly without
-    # running all the other rewite tests on it
+    # running all the other rewrite tests on it.
     # Brandon would have a fit if he saw these if statements. You apparently
     # don't use if statements in nginx. Should replaces these with try_files
     if (-f $request_filename) {

=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2013-05-30 00:25:57 +0000
+++ hooks/db-relation-changed	2013-07-11 16:56:24 +0000
@@ -21,7 +21,7 @@
 fi
 
 cat > /home/discourse/discourse/config/database.yml <<EOF
-# This file was generated by Juju DON'T EDIT IT!
+# This file was generated by Juju. DON'T EDIT IT!
 production:
   adapter: postgresql
   database: $database
@@ -39,7 +39,7 @@
 
 if [ ! -f ".psql" ]; then
   cat > .psql <<EOF
-# This file was generated by Juju!
+# This file was generated by Juju. DON'T EDIT IT!
 db_host=$host
 db_port=$port
 db_user=$user

=== modified file 'hooks/install'
--- hooks/install	2013-05-30 01:56:08 +0000
+++ hooks/install	2013-07-11 16:56:24 +0000
@@ -9,7 +9,7 @@
 
 apt-get install -qy ruby1.9.3 git-core build-essential libxml2-dev \
   libxslt1-dev libpq-dev nginx redis-server postgresql-client-common \
-  postgresql-client-9.1 sendmail libtcmalloc-minimal0
+  postgresql-client-9.1 sendmail libtcmalloc-minimal0 python-cheetah
 
 export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
@@ -27,7 +27,7 @@
   adduser --disabled-password --gecos 'Discourse' discourse
 fi
 
-# Discourse should probably use gunicon. gunicorn is cool.
+# Discourse should probably use gunicorn. gunicorn is cool.
 juju-log "Placing nginx configuration files"
 rsync -az contrib/nginx/ /etc/nginx/sites-available/
 rm -f /etc/nginx/sites-enabled/default
@@ -108,9 +108,9 @@
   echo "$token" > $CHARM_DIR/.secret_token
 fi
 
-if [ -f "/etc/init/discoruse.conf" ]; then
+if [ -f "/etc/init/discourse.conf" ]; then
   juju-log "Replacing old discourse upstart"
-  rm -f /etc/init/discoruse.conf
+  rm -f /etc/init/discourse.conf
 fi
 
 . $CHARM_DIR/lib/file.bash

=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2013-05-28 22:33:22 +0000
+++ hooks/upgrade-charm	2013-07-11 16:56:24 +0000
@@ -4,7 +4,7 @@
 repository=`config-get repository`
 
 if [ "$current_repository" != "$repository" ]; then
-  # Yikes, they want to really blow this up. Lets try a live migration!
+  # Yikes, they want to really blow this up. Let's try a live migration!
   # Move installation out of the way, so we can re-do the whole setup thing.
   mv /home/discourse/discourse /home/discourse/.backup/$(date "+%Y%m%d-%H%M")
   touch $charm_dir/.migrate
@@ -20,7 +20,8 @@
   if [ -f "$charm_dir/.database.yml.bak" ]; then
     cat $charm_dir/.database.yml.bak > config/database.yml
   elif [ -f "config/database.yml" ] && [ ! -f "$charm_dir/.database.yml.bak" ]; then
-    # For backwards compatibility. Remove and favor running relation hook again when bug is fixed in juju-core
+    # For backwards compatibility. Remove and favor running relation hook again
+    # when bug is fixed in juju-core.
     cp config/database.yml $charm_dir/.database.yml.bak
   fi
 

=== modified file 'revision'
--- revision	2013-02-08 18:06:56 +0000
+++ revision	2013-07-11 16:56:24 +0000
@@ -1,1 +1,1 @@
-3
+4