Merge branch 'master' into 0-4-stable

CHANGELOG.md

@@ -2,7 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## [0.4.1] - 2016-08-26
+* Fix typo in letsencrypt email template
+* Update Letsencrypt acme client to latest version
+
+## [0.4.0] - 2016-08-24
 * Add support for running Intercity behind HTTPS (jvanbaarsen)
 * Add support for Letsencrypt based HTTPS (jvanbaarsen)
 * Removed the FROM_EMAIL env var, since this is now configured in the IC interface (jvanbaarsen)

VERSION

@@ -1 +1 @@
-0.3.0
+0.4.1

images/base/Dockerfile

@@ -1,11 +1,11 @@
 # NAME:     intercity_base
-# VERSION:  0.3.0
+# VERSION:  0.4.0
 
 FROM ubuntu:14.04
 
 MAINTAINER Jeroen van Baarsen "https://twitter.com/jvanbaarsen"
 
-RUN echo "0.3.0" > /VERSION
+RUN echo "0.4.0" > /VERSION
 
 # Install dependencies
 RUN apt-get -y upgrade &&\

images/build.rb

@@ -1,6 +1,6 @@
 require 'pty'
 
-$version = "0.3.0"
+$version = "0.4.0"
 
 $base_image = "intercity/base:#{$version}"
 $image = "intercity/intercity:#{$version}"

images/intercity/Dockerfile

@@ -1,4 +1,4 @@
-FROM intercity/base:0.3.0
+FROM intercity/base:0.4.0
 
 MAINTAINER Jeroen van Baarsen "https://twitter.com/jvanbaarsen"
 

launcher

@@ -2,7 +2,7 @@
 
 app_name=intercity
 app_path="/var/$app_name"
-image=intercity/intercity:0.3.0
+image=intercity/intercity:0.4.0
 
 command=$1
 config=$2

samples/app.yml

@@ -4,7 +4,7 @@ templates:
   - "templates/sidekiq.template.yml"
   - "templates/web.template.yml"
   #- "templates/web.ssl.template.yml"
-  #- "templates/web.letsencryp.ssl.template.yml"
+  #- "templates/web.letsencrypt.ssl.template.yml"
 
 expose:
   - "80:80"   # fwd host port 80   to container port 80 (http)
@@ -13,8 +13,7 @@ expose:
 env:
   LANG: en_US.UTF-8
   HOSTNAME: "intercity.example.com"
-
-  #LETSENCRYPT_ACCOUNT_EMAIL: "youremail"
+  LETSENCRYPT_ACCOUNT_EMAIL: "[email protected]"
 
 params:
   # Which Git revision should container use?

templates/web.letsencrypt.ssl.template.yml

@@ -11,7 +11,7 @@ hooks:
     - exec:
        cmd:
          - apt-get install -y netcat
-         - cd /root && git clone https://github.com/Neilpang/acme.sh.git && cd /root/acme.sh && git reset --hard 8d5618c44a2ab973aa7eb243db740e22c742b809
+         - cd /root && git clone https://github.com/Neilpang/acme.sh.git && cd /root/acme.sh && git reset --hard 775bd1abd0d4d0893b30946fd506b8912c4a2481
          - touch /var/spool/cron/crontabs/root
          - install -d -m 0755 -g root -o root $LETSENCRYPT_DIR
          - cd /root/acme.sh && LE_WORKING_DIR="${LETSENCRYPT_DIR}" ./acme.sh --install