Merge lp:~schkovich/charms/trusty/nginx/trunk into lp:~hp-discover/charms/trusty/nginx/trunk

[Goran Miskovic]

Add options to select of of two Nginx PPA: stable or mainline.

Unmerged revisions

11. By Goran Miskovic on 2015-03-20

Using local instead of remote unit name in a log message

10. By Goran Miskovic <email address hidden> on 2015-03-19

Added config-changed hook, created helpers lib and move common logic to it

9. By Goran Miskovic <email address hidden> on 2015-03-18

Added optional stable or mainline PPA

=== modified file 'config.yaml'
--- config.yaml	2014-06-05 22:10:48 +0000
+++ config.yaml	2015-03-20 13:33:58 +0000
@@ -2,4 +2,12 @@
   something:
     type: int
     default: 9001
-    description: "A short description of the configuration option"
+    description: "PHP-FPM pool port."
+  stable:
+    type: boolean
+    default: false
+    description: "Use stable PPA. https://launchpad.net/~nginx/+archive/ubuntu/stable"
+  mainline:
+    type: boolean
+    default: false
+    description: "Use mainline PPA. See https://launchpad.net/~nginx/+archive/ubuntu/development"
\ No newline at end of file

=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2015-03-20 13:33:58 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -eux
+
+DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+
+source "${DIR}/install"

=== modified file 'hooks/install'
--- hooks/install	2014-06-08 02:20:29 +0000
+++ hooks/install	2015-03-20 13:33:58 +0000
@@ -2,7 +2,15 @@
 
 set -eux
 
-apt-get install -y nginx-full python-cheetah
-
-mkdir -p /srv
+DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+
+source "${DIR}/../lib/bash/helpers.sh"
+
+configureNginxPpa
+apt-get update --quiet
+installPackage 'nginx-full'
+idempotentInstall 'python-cheetah'
+
+mkdir -p /srv || true
 rm -f /etc/nginx/sites-enabled/*default* || true

=== modified file 'hooks/start'
--- hooks/start	2014-06-05 22:10:48 +0000
+++ hooks/start	2015-03-20 13:33:58 +0000
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+set -eux
+
 service nginx restart || service nginx start

=== modified file 'hooks/stop'
--- hooks/stop	2014-06-05 22:10:48 +0000
+++ hooks/stop	2015-03-20 13:33:58 +0000
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+set -eux
+
 service nginx stop

=== added directory 'lib'
=== added directory 'lib/bash'
=== added file 'lib/bash/helpers.sh'
--- lib/bash/helpers.sh	1970-01-01 00:00:00 +0000
+++ lib/bash/helpers.sh	2015-03-20 13:33:58 +0000
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Installs given package
+# Expects one argument: package-name
+# installPackage "puppet" will install Puppet
+# Overwrites any existing configuration files(s)
+# see: https://bugs.launchpad.net/ubuntu/+source/dpkg/+bug/92265/comments/4
+function installPackage {
+  local package="${1}"
+  local exitcode=0
+  DEBIAN_FRONTEND=noninteractive bash -c "apt-get -qq -o Dpkg::Options::='--force-confnew' -y install ${package}" >/dev/null  || exitcode=$?
+  if [ "0" -eq "${exitcode}" ]; then
+    juju-log "Successfully installed package ${package}";
+  else
+    # a chance to log the error
+    juju-log "Error ${exitcode} installing package ${package}";
+    # exit with the same code
+    exit ${exitcode}
+  fi
+}
+
+# Checks if given package is installed
+# Expects one argument: package-name
+# isPackageInstalled "puppet" will check if Puppet is installed
+# returns 0 case when package is installed otherwise returns 33
+# When running with e flag set returning any other code than 0
+# will stop execution.
+function isPackageInstalled {
+  # http://superuser.com/questions/43342/how-can-i-display-the-list-of-all-packages-installed-on-my-debian-system
+  if dpkg --get-selections | grep -q "^${1}[[:space:]]*install$" >/dev/null; then
+    juju-log "Package ${1} is already installed.";
+    return 0
+  else
+    juju-log "Package ${1} is not installed.";
+    return 33
+  fi
+}
+
+# Purges given package
+# Expects one argument: package-name
+# purgePackage "puppet" will completely remove Puppet installation
+function purgePackage {
+  local package="${1}"
+  local exitcode=0
+  isPackageInstalled ${package} || exitcode=$?
+  # if package is installed and there was no error
+  if [ "0" -eq  "${exitcode}" ]; then
+    juju-log "Purging old ${package} installation at ${JUJU_UNIT_NAME:-unset}"
+    apt-get purge "${package}" --yes
+    apt-get autoremove --yes
+  # if return code is not 33 exit with that code
+  elif [ "33" -ne "${exitcode}" ]; then
+    exit ${exitcode}
+  fi
+}
+
+# Installs package if it is not already installed
+# Expects one argument: package-name
+# idempotentInstall "puppet" will check if package "puppet" is installed and case it is not it will install it
+function idempotentInstall {
+  local package="${1}"
+  local exitcode=0
+  if [[ -z "${package// }" ]];
+  then
+    juju-log "Could not install. No package name given";
+    exit 1;
+  fi
+  isPackageInstalled ${package} || exitcode=$?
+  if [ "0" -ne  "${exitcode}" ]; then
+    juju-log "Installing ${package}"
+    installPackage ${package}
+  fi
+}
+
+# Based on configuration will add or remove stable or mainline Nginx PPA
+# @see config.yaml
+# If both packages are configured to be added error will be triggered
+function configureNginxPpa {
+
+  # The first letter will be capital when set from GUI causing error: helpers.sh: line 85: True: command not found
+  local stable=$(config-get "stable"  | tr '[:upper:]' '[:lower:]')
+  local mainline=$(config-get "mainline" | tr '[:upper:]' '[:lower:]')
+
+  if ${stable} && ${mainline}; then
+    juju-log "Either stable or mainline PPA could be added."
+    exit 1
+  fi
+
+  if ${stable}; then
+    apt-add-repository --yes ppa:nginx/stable
+  else
+    apt-add-repository --remove --yes ppa:nginx/stable
+  fi
+
+  if ${mainline};
+  then
+    apt-add-repository --yes ppa:nginx/development
+  else
+    apt-add-repository --remove --yes ppa:nginx/development
+  fi
+
+}