27bdbf6a · 669ecc53 · df390174 · ba385e76 · 1c5be94b · fe9dcb2c
--- a/.gitignore
+++ b/.gitignore
-.vagrant
+*.swp
-docker-haproxy-confd
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# 1.2.0
+* Add app admin email as argument in provision #189 
+* Handle git branches when provisioning #174 
+* REPO mode to retrieve application recipe #187 
 # 0.3.0
 * adds automation script for user provisionning

--- a/INSTALL.cloud.md
+++ b/INSTALL.cloud.md
+# Instructions to install libre.sh
+## Recommendation
+- you'd need API key on Namecheap (if you want to automatically buy and configure domain name)
+## Installation
+These instructions depend a bit on your cloud provider.
+### [Digital Ocean](https://m.do.co/c/1b468ce0671f)
+ 1. Install [doctl](https://github.com/digitalocean/doctl/)
+ 2. Issue the following command:
+```
+doctl compute droplet create libre.sh --user-data-file ./user_data --wait --ssh-keys $KEY_ID --size 1gb --region lon1 --image coreos-stable
+```
+### Provider with user_data support
+If you use a cloud provider that support `user_data`, like [Scaleway](http://scaleway.com/), just use [this user_data](https://raw.githubusercontent.com/indiehosters/libre.sh/master/user_data).
+### Hetzner
+You can also buy a baremetal at [Hetzner](https://serverboerse.de/index.php?country=EN) as they are the cheapest options around. Follow these [instructions](INSTALL_HETZNER.md) in this case.
+### Provider without user_data support
+Use boot a live cd, and issue that command:
+```
+wget https://raw.github.com/coreos/init/master/bin/coreos-install
+bash coreos-install -d /dev/sda -c user_data
+```
+And voila, your first libre.sh node is ready!
--- a/INSTALL_HETZNER.md
+++ b/INSTALL_HETZNER.md
+# Instructions to install libre.sh
+## Recommendation
+- ssd on /dev/sda
+- hdd on /dev/sdb
+- hdd on /dev/sdc
+- API key on Namecheap (if you want to automatically buy domain name)
+# Installation
+First, you need a server.
+We recommend [Hetzner](https://serverboerse.de/index.php?country=EN) as they are the cheapest options around.
+You can filter servers with ssd.
+These instructions can also work on any VM/VPS/Hardware.
+## Install the system
+```
+IP=
+ssh -o "StrictHostKeyChecking no" root@$IP
+hostname=
+ssh_public_key=""
+fdisk -l #find your ssd
+# Setup raid
+cat > /etc/mdadm.conf << EOF
+MAILADDR dev@null.org
+EOF
+mdadm --create --verbose /dev/md0 --level=mirror --raid-devices=2 /dev/sdb /dev/sdc
+mkfs.ext4 /dev/md0
+cat > cloud-config.tmp << EOF
+#cloud-config
+hostname: "$hostname"
+ssh_authorized_keys:
+  - $ssh_public_key
+EOF
+apt-get install gawk
+wget https://raw.github.com/coreos/init/master/bin/coreos-install
+bash coreos-install -d /dev/sda -c cloud-config.tmp
+reboot
+```
+```
+ssh core@$IP
+#configure mdmonitor.
+sudo su -
+mdadm --examine --scan > /etc/mdadm.conf
+vim /etc/mdadm.conf
+#ADD your mail
+MAILADDR xxx@xxx.org
+# Start service
+systemctl start  mdmonitor.service
+cat > /etc/systemd/system/data.mount << EOF
+[Mount]
+What=/dev/md0
+Where=/data
+Type=ext4
+EOF
+wget https://raw.githubusercontent.com/indiehosters/libre.sh/master/user_data -O /var/lib/coreos-install/user_data
+coreos-cloudinit /var/lib/coreos-install/user_data
--- a/INSTALL_LINUX.md
+++ b/INSTALL_LINUX.md
+# Instructions to install libre.sh on linux with Systemd
+## Recommendation
+- Systemd distro (ubuntu server 18.04.3 or debian 9 )
+# Installation
+Where basicly reproduce what the user_data do for us.
+as root
+# configure sshd (Optional)
+Don't forget to create the user core and adding your ssh key before
+You could also remove AllowUsers core or/and change the username.
+```
+cat > /etc/ssh/sshd_config <<EOF
+UsePrivilegeSeparation sandbox
+Subsystem sftp internal-sftp
+PermitRootLogin no
+AllowUsers core
+PasswordAuthentication no
+ChallengeResponseAuthentication no
+EOF
+chmod 600 /etc/ssh/sshd_config
+systemctl restart sshd
+```
+# add kernel parameter (optional but recommended )
+```
+cat > /etc/sysctl.d/libresh.conf <<EOF
+fs.aio-max-nr=1048576
+vm.max_map_count=262144
+vm.overcommit_memory=1
+EOF
+chmod 644 /etc/sysctl.d/libresh.conf
+sysctl -p /etc/sysctl.d/libresh.conf
+echo never > /sys/kernel/mm/transparent_hugepage/enabled
+```
+# define Localhost (should not be needed but... )
+```
+cat > /etc/hosts <<EOF
+127.0.0.1 localhost
+255.255.255.255 broadcasthost
+::1 localhost
+EOF
+```
+# define envrionment
+```
+cat > /etc/environment <<EOF
+NAMECHEAP_URL="namecheap.com"
+NAMECHEAP_API_USER="pierreo"
+NAMECHEAP_API_KEY=
+IP="curl -s http://icanhazip.com/"
+FirstName="Pierre"
+LastName="Ozoux"
+Address=""
+PostalCode=""
+Country="Portugal"
+Phone="+351.967184553"
+EmailAddress="pierre@ozoux.net"
+City="Lisbon"
+CountryCode="PT"
+BACKUP_DESTINATION=root@xxxxx:port
+MAIL_USER=
+MAIL_PASS=
+MAIL_HOST=mail.indie.host
+MAIL_PORT=587
+EOF
+```
+# install docker
+*Current tested version : 19.03.5 see https://docs.docker.com/install/linux/docker-ce/ubuntu/ .*  
+# install docker-compose
+*Remark I did a variante to find the last version of DockerCompose and download it*
+```
+mkdir -p /opt/bin &&\
+dockerComposeVersion=$(curl -s https://api.github.com/repos/docker/compose/releases/latest|grep tag_name|cut -d'"' -f4) &&\
+curl -L https://github.com/docker/compose/releases/download/$dockerComposeVersion/docker-compose-`uname -s`-`uname -m` > /opt/bin/docker-compose &&\
+chmod +x /opt/bin/docker-compose
+```
+# install Libre.sh
+```
+git clone https://lab.libreho.st/libre.sh/compose.libre.sh /libre.sh &&\
+mkdir -p /{data,system} &&\
+mkdir -p /data/trash &&\
+cp /libre.sh/unit-files/* /etc/systemd/system && systemctl daemon-reload &&\
+systemctl enable web-net.service &&\
+systemctl start web-net.service &&\
+mkdir -p /opt/bin &&\
+cp /libre.sh/utils/* /opt/bin/
+```
+# add /opt/bin path
+```
+cat > /etc/profile.d/libre.sh <<EOF
+export PATH=$PATH:/opt/bin
+EOF
+chmod 644 /etc/profile.d/libre.sh
+```
--- a/README.md
+++ b/README.md
-## IndieHosters
+# libre.sh Version 1.2
+[![Backers on Open Collective](https://opencollective.com/libresh/backers/badge.svg)](#backers)
+ [![Sponsors on Open Collective](https://opencollective.com/libresh/sponsors/badge.svg)](#sponsors) 
-This repository contains the configuration and scripts I use to control my servers.
+## Introduction
+An ecosystem to ease  free software hosting \o/
+We are working on bootstrapping an ecosystem of tools to facilitate the hosting of free software.
+Think of it as
+ - [ISPconfig](https://www.ispconfig.org/)
+ - FLOSS [cpanel](https://www.cpanel.net/products/)
+ - [cloudron](https://cloudron.io/) with email
+  * Libre.sh V1 (Stable) is using docker-compose 
+  * Libre.sh V2 (Alpha) is using [kubernetes](https://kubernetes.io/).
+This ecosystem can be deployed on [Raspberries](https://kubecloud.io/setting-up-a-kubernetes-1-11-raspberry-pi-cluster-using-kubeadm-952bbda329c8) or on popular cloud providers and scale globally or anything in between. 
+We can affirm that V2 scales globally because it is based on kubernetes, a tool developped from the experience of Google hosting containers at scale.
+## Installation
+To install it, follow the instructions in `INSTALL_LINUX.md` : https://lab.libreho.st/libre.sh/compose.libre.sh/blob/master/INSTALL_LINUX.md
+Or run our installer script 
+https://lab.libreho.st/libre.sh/compose.libre.sh/raw/master/install.linux.sh
+### What is libre.sh
+libre.sh is a little framework to host Docker. It is simple and modular and respect the convention over configuration paradigm.
+This is aimed at Hosters to manage a huge amount of different web application, and a quantity of domain names related with emails and so on.
+It is currently installed at 3 different hosters in production and hosting ~20 different web applications, with ~500 containers.
+Once well installed, in one bash command, you'll be able to:
+ - buy a domain name
+ - configure DNS for it
+ - configure email for it
+ - configure dkim for that domain
+ - configure dmarc for that domain
+ - configure autoconfig for that domain
+ - install and start a web application on that domain (WordPress, Nextcloud, piwik...)
+ - provision a TLS cert on that domain
+Amazing, right?
+### Modular
+The PaaS is really modular, that's why it contains the strict necessary, then you'll probably want to add `system` modules or `applications`.
+It contains 2 [unit-files](https://lab.libreho.st/libre.sh/compose.libre.sh/tree/master/unit-files) to manage system modules and applications, start them at boot, and load the appropriate environment.
+### Support
+You can use the following channels to request community support:
+ - [mailinglist/forum](https://forum.indie.host/t/about-the-libre-sh-category/71)
+ - [chat](https://chat.indie.host/channel/libre.sh)
+For paid support, just send an inquiry to support@libre.sh.
+You can also watch the Fosdem Video : [Video Fosdem](https://fosdem.org/2017/schedule/event/libre_sh/)
+All of this is hosted by libre.sh :)
+## System modules
+Here is a list of modules supported:
+ - https proxy:
+ - [HAProxy](https://lab.libreho.st/libre.sh/compose/haproxy)
+ - [Nginx](https://lab.libreho.st/libre.sh/compose/nginx)
+ - [monitoring](https://lab.libreho.st/libre.sh/compose/monitoring)
+ - [git-puller](https://lab.libreho.st/libre.sh/compose/git-puller)
+Go to their respective page for more details.
+### To install and start a module:
+```
+cd /system/
+git clone https://lab.libreho.st/libre.sh/compose/[module]
+cd module
+libre enable
+libre start
+```
+## Applications
+### List of supported applications
+| Application  | Latest Version             | Comments   |
+|--------------|---------------------------|------------|
+| wordpress    | 5.9   |  Includes the support of SMTP email though libresh variables       |
+| dolibarr     | 15.0.3   | need manual deletion of the install.lock to upgrade        |
+### Installation
+To install application `wordpress` on `example.org`, first make point example.org to your server IP, and then, just run:
+```
+libre provision -a wordpress -u example.org -s
+```
+- -u   [arg] URL to process. Required.
+- -a   [arg] Application to install. (wordpress in REPO_MODE)
+- -t   [arg] Checkout a specific tag or branch from the application repo. default to master
+- -e   [arg] Specify the email of the application admin 
+- -s         Start the application right away.
+- -b         Buys the associated domain name.
+- -i         Configure OpenDKIM.
+- -c         Configures DNS if possible.
+## To debug a module or an application:
+```
+libre ps
+libre logs -f --tail=100
+libre stop
+libre restart
+```
+## Contributing
+If you have any issue (something not working, missing doc), please do report an issue here! Thanks
+This system is used in production at [IndieHosters](https://indiehosters.net/) so it is maintained. If you use it, please tell us, and we'll be really happy to update this README!
+You can help us by:
+ - starring this project
+ - sending us a thanks email
+ - reporting bugs
+ - writing documentation/blog on how you got up and running in 5mins
+ - writing more documentation
+ - sending us cake :) We loove cake!
+## Contributors
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/indiehosters/libre.sh/graphs/contributors"><img src="https://opencollective.com/libresh/contributors.svg?width=890&button=false" /></a>
+## Backers
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/libresh#backer)]
+<a href="https://opencollective.com/libresh#backers" target="_blank"><img src="https://opencollective.com/libresh/backers.svg?width=890"></a>
+## Sponsors
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/libresh#sponsor)]
+<a href="https://opencollective.com/libresh/sponsor/0/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/libresh/sponsor/1/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/libresh/sponsor/2/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/libresh/sponsor/3/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/libresh/sponsor/4/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/libresh/sponsor/5/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/libresh/sponsor/6/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/libresh/sponsor/7/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/libresh/sponsor/8/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/libresh/sponsor/9/website" target="_blank"><img src="https://opencollective.com/libresh/sponsor/9/avatar.svg"></a>
+## Other projects
+Simplifying web application hosting has always been a goal for a lot of other projects, here is some project that share goals with libre.sh
+ - Yunohost https://yunohost.org
+ - Sandstorm https://sandstorm.io/
+ - Cloudron https://git.cloudron.io/cloudron/box
-There is no documentation yet, work in progress. If you want to use this repo, please send me an email.
--- a/ROADMAP.md
+++ b/ROADMAP.md
+# TL;DR
+ - k8s
+  - [ ] ceph
+  - [ ] flannel
+  - [ ] baremetal install
+# Object
+The aim of this document is to write the big lines of the future of libre.sh.
+# Version 1
+The current version, let's call it 1, is a nice opiniated framework on how to run a single host with docker-compose.
+It provides a list of packages and module compatible with this framework.
+The best features of this framework are:
+ - https only
+ - some integration between the tools (auto provisioning of emails for new applications)
+ - domain name buying (Namecheap api)
+ - dns configuration (Namecheap api)
+# Version 2 - k8s
+This roadmap will discuss about the migration to kubernetes (k8s).
+## Distributions
+There are various k8s distributions (Tectonic, deis, openshift..) and the aim of libre.sh is not to become yet another distribution.
+It would be nice if we could list them, evaluate them, and decide to use one of them or not.
+## Installation/Operation
+libre.sh should be opiniated on the way to install and operate the cluster.
+It should provide easy steps to install on baremetal first. We aim for libre software, and as such, we can't rely
+on cloud providers like gcloud, aws, or digital ocean.
+As a second priority, we should give easy instructions to deploy on any cloud providers, as people are free to choose their chains :)
+## Storage
+One big challenge in k8s cluster context is to provide an implementation of major cloud providers about [PersistantVolume](https://kubernetes.io/docs/user-guide/persistent-volumes/).
+In a libre cluster, this function would be achieved by a distributed file system technology.
+After some investigation, the choice would be to use ceph.
+There are already some work done on it like the [ceph-docker](https://github.com/ceph/ceph-docker/tree/master/examples) repo.
+## Network
+Another big challenge is network. k8s is strongly opiniated on what should be the network configuration.
+Ideally, we would use some IPsec to secure the links between machine in a context we can't trust the network (like at hetzner).
+There are 3 options:
+ - zerotier  
+ - tinc vpn
+ - flannel that might implement IPsec in a near future
+The cheapest in term of work would be to bet on flannel.
+## Packages
+There is now a way to create and distribute packages in a standard way.
+We can then remove the idea of modules and applications.
+They will all be packages.
+The k8s standard for that is [helm](http://helm.sh/). There is already a big list of packages.
+As for libre.sh, the idea would be to contribute the missing packages there.
+### opportunistic packages
+libre.sh would then be, just a repo of documentation on how to install, operate and manage a k8s cluster on baremetal.
+There is still a place where we can have a difference.
+This idea is called opportunistic package.
+This would be a package based on an official one.
+Let's take the example of WordPress.
+The libre.sh version of WordPress would be based on the official one.
+But it will have some mechanisms to discovers services available inside the cluster it is running on.
+These services could be:
+ - ldap
+ - piwik
+ - email
+So, when you install a new WordPress, it will try to discover opportunistically if there is a ldap service in the cluster,
+and if yes, configure WordPress to use this ldap service.
+This pattern will help make it happen:
+https://github.com/kubernetes-incubator/service-catalog
--- a/dockerfiles/backup/duplicity/Dockerfile
+++ b/dockerfiles/backup/duplicity/Dockerfile
-FROM debian:jessie
-ENV DEBIAN_FRONTEND noninteractive
-RUN \
-  export VERSION=0.7.01 && \
-  apt-get update && \
-  apt-get install -y wget python python-dev python-pip librsync-dev ncftp lftp rsync && \
-  rm -rf /var/lib/apt/lists/* && \
-  pip install --upgrade lockfile paramiko pycrypto && \
-  cd /tmp/ && \
-  wget https://launchpad.net/duplicity/0.7-series/$VERSION/+download/duplicity-$VERSION.tar.gz && \
-  cd /opt/ && \
-  tar xzvf /tmp/duplicity-$VERSION.tar.gz && \
-  rm /tmp/duplicity-$VERSION.tar.gz && \
-  cd duplicity-$VERSION && \
-  ./setup.py install
-ENTRYPOINT [ "/usr/local/bin/duplicity" ]
--- a/dockerfiles/email/postfix/Dockerfile
+++ b/dockerfiles/email/postfix/Dockerfile
-FROM debian:jessie
-# Borrows from https://registry.hub.docker.com/u/previousnext/postfix
-# Borrows from https://registry.hub.docker.com/u/catatnight/postfix
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update \
-	&& echo "postfix postfix/main_mailer_type string 'Internet site'" | debconf-set-selections \
-	&& echo "postfix postfix/mailname string 'HOSTNAME.EXAMPLE.COM'" | debconf-set-selections \
-	&& echo "postfix postfix/root_address string 'ROOTMAIL@EXAMPLE.COM'" | debconf-set-selections \
-	&& apt-get install -q -y \
-		postfix \
-		rsyslog \
-		supervisor \
-	&& rm -rf /var/lib/apt/lists/*
-COPY install.sh /opt/install.sh
-VOLUME ["/etc/postfix", "/var/spool/mail", "/var/log"]
-EXPOSE 25
-CMD /opt/install.sh;/usr/bin/supervisord -c /etc/supervisor/supervisord.conf
--- a/dockerfiles/email/postfix/install.sh
+++ b/dockerfiles/email/postfix/install.sh
-#!/bin/bash
-#judgement
-if [[ -a /etc/supervisor/conf.d/supervisord.conf ]]; then
-  exit 0
-fi
-#supervisor
-cat > /etc/supervisor/conf.d/supervisord.conf <<EOF
-[supervisord]
-nodaemon=true
-[program:postfix]
-command=/opt/postfix.sh
-[program:rsyslog]
-command=/usr/sbin/rsyslogd -n
-EOF
-############
-# postfix
-############
-cat >> /opt/postfix.sh <<EOF
-#!/bin/bash
-service postfix start
-touch /var/log/mail.log
-tail -f /var/log/mail.log
-postmap /etc/postfix/virtual
-service postfix restart
-EOF
-chmod +x /opt/postfix.sh
-# put the same FQDN in /data/hostname and in reverse DNS
-# for the public IP address on which this server will be
-# receiving smtp traffic.
-cp /data/hostname /etc/mailname
-/usr/sbin/postconf -e "myhostname=`cat /data/hostname`"
-# put all relevant domains in /data/destinations.
-/usr/sbin/postconf -e "virtual_alias_domains=`cat /data/destinations`"
-#put your forwarding addresses in /data/forwards.
-cp /data/forwards /etc/postfix/virtual
-/usr/sbin/postconf -e "virtual_alias_maps = hash:/etc/postfix/virtual"
-# accept mails from docker networked machines:
-/usr/sbin/postconf -e "mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 172.17.42.0/24"
--- a/dockerfiles/load-balancer/confd/Dockerfile
+++ b/dockerfiles/load-balancer/confd/Dockerfile
-FROM debian:jessie
-ENV DEBIAN_FRONTEND noninteractive
-RUN \
-  apt-get update &&\
-  apt-get install -y \
-    wget \
-    ca-certificates &&\
-  rm -rf /var/lib/apt/lists/*
-ADD confd /etc/confd
-RUN \
-  wget https://github.com/kelseyhightower/confd/releases/download/v0.6.3/confd-0.6.3-linux-amd64 -O confd && \
-  chmod +x confd
-RUN \
-  wget https://get.docker.com/builds/Linux/x86_64/docker-1.2.0 -O docker && \
-  chmod +x docker
-VOLUME ["/etc/confd/", "/etc/haproxy"]
-ENTRYPOINT ["/confd"]
-CMD ["-interval=60", "-node=172.17.42.1:4001"]
--- a/dockerfiles/load-balancer/confd/README.md
+++ b/dockerfiles/load-balancer/confd/README.md
-# Confd
-The smallest confd docker image in town ;)
-## Run
-This image will log everything to stdout/stderr.
-It was designed to work with HAproxy, but you can use it for anything! There is no configuration, you'll have to mount the config folder. There is a nice example in [indiehosters/confd git repo](https://github.com/indiehosters/dockerfiles/tree/master/server-wide/confd).
-```bash
-docker run\
-  -v /haproxy-config:/etc/haproxy/\
-  -v ./confd/:/etc/confd/\
-  -v /var/run/docker.sock:/var/run/docker.sock\
-indiehosters/confd
-```
-It works really well with [indiehosters/haproxy](https://registry.hub.docker.com/u/indiehosters/haproxy/) to have automatic configuration of HAproxy backed by `etcd` or `consul`.
--- a/dockerfiles/load-balancer/confd/confd/conf.d/crt-list.toml
+++ b/dockerfiles/load-balancer/confd/confd/conf.d/crt-list.toml
-[template]
-src  = "crt-list.tmpl"
-dest = "/etc/haproxy/crt-list"
-keys = [
-  "/services"
-]
-reload_cmd = "/docker kill --signal=\"SIGUSR1\" haproxy"
--- a/dockerfiles/load-balancer/confd/confd/conf.d/haproxy.toml
+++ b/dockerfiles/load-balancer/confd/confd/conf.d/haproxy.toml
-[template]
-src  = "haproxy.cfg.tmpl"
-dest = "/etc/haproxy/haproxy.cfg"
-keys = [
-  "/services"
-]
-reload_cmd = "/docker kill --signal=\"SIGUSR1\" haproxy"
--- a/dockerfiles/load-balancer/confd/confd/templates/crt-list.tmpl
+++ b/dockerfiles/load-balancer/confd/confd/templates/crt-list.tmpl
-{{range $app := lsdir "/services"}}
-{{$hostnames := printf "/services/%s/*" $app}}
-  {{range gets $hostnames}}
-    {{$hostname := .Key}}
-/etc/haproxy/approved-certs/{{base $hostname}}.pem {{base $hostname}}
-/etc/haproxy/approved-certs/{{base $hostname}}.pem www.{{base $hostname}}
-  {{end}}
-{{end}}
--- a/dockerfiles/load-balancer/confd/confd/templates/haproxy.cfg.tmpl
+++ b/dockerfiles/load-balancer/confd/confd/templates/haproxy.cfg.tmpl
-global
-  maxconn 4096
-  user haproxy
-  group haproxy
-  tune.ssl.default-dh-param 2048
-  ssl-default-bind-ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
-defaults
-  mode http
-  option forwardfor
-  option httpclose
-  option httplog
-  option dontlognull
-  retries 3
-  timeout connect 5000
-  timeout client 50000
-  timeout server 50000
-frontend https-in
-mode http
-  bind *:443 ssl no-sslv3 crt-list /etc/haproxy/crt-list crt /etc/haproxy/approved-certs/default.pem
-  # HSTS (15768000 seconds = 6 months)
-  rspadd  Strict-Transport-Security:\ max-age=15768000
-  reqadd X-Forwarded-Proto:\ https
-{{range $app := lsdir "/services"}}
-{{$hostnames := printf "/services/%s/*" $app}}
-  {{range gets $hostnames}}
-    {{$hostname := .Key}}
-    {{$data := json .Value}}
-# {{base $hostname}}:
-  acl https_{{base $hostname}} hdr(host) -i {{base $hostname}}
-  acl https_{{base $hostname}} hdr(host) -i www.{{base $hostname}}
-  use_backend {{base $hostname}} if https_{{base $hostname}}
-  {{end}}
-{{end}}
-frontend http-in
-  bind *:80
-  redirect scheme https code 301
-{{range $app := lsdir "/services"}}
-{{$hostnames := printf "/services/%s/*" $app}}
-  {{range gets $hostnames}}
-    {{$hostname := .Key}}
-    {{$data := json .Value}}
-# {{base $hostname}}:
-backend {{base $hostname}}
-  cookie SERVERID insert nocache indirect
-  server Server {{$data.ip}}:{{$data.port}} cookie Server
-  {{end}}
-{{end}}
--- a/dockerfiles/load-balancer/haproxy/Dockerfile
+++ b/dockerfiles/load-balancer/haproxy/Dockerfile
-FROM debian:jessie
-ENV DEBIAN_FRONTEND noninteractive
-# Install Haproxy.
-RUN \
-  apt-get update && \
-  apt-get install -y haproxy && \
-  rm -rf /var/lib/apt/lists/*
-VOLUME ["/etc/haproxy"]
-ENTRYPOINT ["haproxy"]
-CMD ["-d", "-f", "/etc/haproxy/haproxy.cfg"]
-EXPOSE 80
-EXPOSE 443
--- a/dockerfiles/load-balancer/haproxy/README.md
+++ b/dockerfiles/load-balancer/haproxy/README.md
-# HAproxy
-The smallest HAproxy docker image in town ;)
-## Run
-This image will log everything to stdout/stderr. Somehow, it respects 12-Factor App. But it uses the debug flag of HAProxy. If you have a better idea, please read this [blog post](http://pierre-o.fr/blog/2014/08/27/haproxy-coreos/) first.
-```bash
-docker run\
-  -v /haproxy-config:/etc/haproxy\
-  -p 80:80\
-  -p 443:443\
-  indiehosters/haproxy
-```
-Have a look to [indiehosters/confd](https://registry.hub.docker.com/u/indiehosters/confd/) to have automatic configuration of HAproxy backed by `etcd` or `consul`.
--- a/dockerfiles/services/apache/Dockerfile
+++ b/dockerfiles/services/apache/Dockerfile
-FROM debian:jessie
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update \
-	&& apt-get -yq install \
-		apache2 \
-		curl \
-		mysql-client \
-		libapache2-mod-php5 \
-		php-apc \
-		php-pear \
-		php5-curl \
-		php5-gd \
-		php5-mysql \
-		php5-xmlrpc \
-                ssmtp \
-	&& rm -rf /var/lib/apt/lists/*
-# Add image configuration and scripts
-ADD default.conf /etc/apache2/sites-enabled/000-default.conf
-ADD run.sh /run.sh
-RUN sed -i "s/variables_order.*/variables_order = \"EGPCS\"/g" /etc/php5/apache2/php.ini && \
-    sed -i "s/.*sendmail_path.*/sendmail_path = \/usr\/sbin\/ssmtp -t/g" /etc/php5/apache2/php.ini \
-	&& mkdir -p /app \
-	&& rm -rf /var/www/html \
-	&& ln -s /app /var/www/html \
-	&& a2enmod rewrite \
-	&& chmod 755 /run.sh
-COPY ssmtp.conf /etc/ssmtp/ssmtp.conf
-CMD ["/run.sh"]
-EXPOSE 80
--- a/dockerfiles/services/apache/default.conf
+++ b/dockerfiles/services/apache/default.conf
-<VirtualHost *:80>
-  # The ServerName directive sets the request scheme, hostname and port that
-  # the server uses to identify itself. This is used when creating
-  # redirection URLs. In the context of virtual hosts, the ServerName
-  # specifies what hostname must appear in the request's Host: header to
-  # match this virtual host. For the default virtual host (this file) this
-  # value is not decisive as it is used as a last resort host regardless.
-  # However, you must set it for any further virtual host explicitly.
-  #ServerName www.example.com
-  ServerAdmin webmaster@localhost
-  DocumentRoot /var/www/html
-  # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
-  # error, crit, alert, emerg.
-  # It is also possible to configure the loglevel for particular
-  # modules, e.g.
-  #LogLevel info ssl:warn
-  ErrorLog ${APACHE_LOG_DIR}/error.log
-  CustomLog ${APACHE_LOG_DIR}/access.log combined
-  # For most configuration files from conf-available/, which are
-  # enabled or disabled at a global level, it is possible to
-  # include a line for only one particular virtual host. For example the
-  # following line enables the CGI configuration for this host only
-  # after it has been globally disabled with "a2disconf".
-  #Include conf-available/serve-cgi-bin.conf
-  <Directory /var/www/html/>
-    Options -Indexes +FollowSymLinks +MultiViews
-    AllowOverride All
-    Order allow,deny
-    allow from all
-  </Directory>
-</VirtualHost>