Merge lp:~hatch/charms/precise/ghost/trunk into lp:charms/ghost

[Jeff Pihach]

Removes the included Ghost asset in favour of a remote release link because Ghost updates so often that it gets out of date very fast.

[Whit Morriss (whitmo)]

LGTM +1. Merged cleanly, deployed fine w/ mysql, comes up with default empty blog content.

Jeff thanks for this update, it's a much better way of tracking the current releases.

-w

review: Approve

=== removed file 'assets/Ghost-0.5.5.zip'
 Binary files assets/Ghost-0.5.5.zip	2014-11-27 04:04:09 +0000 and assets/Ghost-0.5.5.zip	1970-01-01 00:00:00 +0000 differ
=== modified file 'config.yaml'
--- config.yaml	2014-11-27 04:04:09 +0000
+++ config.yaml	2015-04-03 04:11:24 +0000
@@ -11,6 +11,11 @@
     description: Port to be passed to node's net.Server listen().
     type: int
     default: 2368
+  release_location:
+    description: |
+        Location of the Ghost blogging platform release archive to deploy.
+    type: string
+    default: https://github.com/TryGhost/Ghost/releases/download/0.5.10/Ghost-0.5.10.zip
   mail_service:
     description: |
         Pick one of the supported email services to allow Ghost to send emails
 
=== removed file 'hooks/database-relation-changed'
--- hooks/database-relation-changed	2013-11-26 03:43:17 +0000
+++ hooks/database-relation-changed	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#!/usr/bin/env node
-
-var utils = require('../utils/utils'),
-    dbutils = require('../utils/dbutils'),
-    exec = require('child_process').exec;
-// create the mysql switch so config-changed knows to leave db config alone.
-exec('touch mysql');
-exec('relation-get --format=json', dbutils.configureMysql);
-
-/*
-  Setup the mysql db config file.
-
-  @method configureMysql
-  @param {Object} err Exec function error
-  @param {Object} config The json config data
-*/
-function configureMysql(err, config) {
-  config = JSON.parse(config);
-  var required_keys = ['user', 'database', 'password', 'private-address'];
-  required_keys.map(function(key) {
-    if(!(key in config)) {
-      // We don't have the keys we need, exit silently by convention.
-      exec('juju-log DB Relation doesn\'t provide required keys.', noop);
-      return;
-    }
-  });
-  utils.renderTemplate(config, 'mysql.js.template', 'dbconfig.js');
-};
-
-exec('relation-get --format=json', configureMysql);
 
=== modified file 'hooks/install'
--- hooks/install	2014-11-27 04:04:09 +0000
+++ hooks/install	2015-04-03 04:11:24 +0000
@@ -3,7 +3,10 @@
 set -e
 
 juju-log "Adding Node PPA."
-add-apt-repository ppa:chris-lea/node.js -y
+wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -
+
+echo "deb https://deb.nodesource.com/node $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/nodesource.list
+echo "deb-src https://deb.nodesource.com/node $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list.d/nodesource.list
 
 juju-log "Updating APT."
 apt-get update
@@ -17,7 +20,10 @@
 chmod 644 /etc/init/ghost.conf
 # Unzip and move to it's proper location
 mkdir -p /var/www/ghost
-unzip -uo assets/Ghost-0.5.5.zip -d /var/www/ghost
+LOCATION=$(config-get release_location)
+juju-log "Fetching Ghost from location: ${LOCATION}"
+wget -O /tmp/ghost.zip ${LOCATION}
+unzip -uo /tmp/ghost.zip -d /var/www/ghost
 
 cd /var/www/ghost
 npm install --production