Merge branch 'release/1.0'

README.md

@@ -19,13 +19,15 @@ Each time you add a container with the environment variable `VIRTUAL_HOST` it wi
  - docker
  - docker-compose
 
-## Get started
+## Get started ( for libre.sh  )
 
 ```
-docker network create lb_web
-git clone https://github.com/indiehosters/haproxy.git
+# docker network create lb_web (already done when you install libre.sh )
+cd /system/
+git clone https://lab.libreho.st/libre.sh/compose/haproxy
 cd haproxy
-docker-compose up -d
+libre enable
+libre start
 ```
 
 In these commands, we just created one network (lb_web) to isolate HAProxy with the web servers, and then, we started the containers of HAProxy and companions.

docker-compose.yml

@@ -31,7 +31,7 @@ services:
     networks:
     - lb_web
   letsencrypt:
-    image: indiehosters/letsencrypt
+    image: libresh/letsencrypt
     volumes:
     - "./haproxy:/etc/haproxy"
     - "./acme-challenge:/html-root/.well-known/acme-challenge/"

templates/haproxy.cfg.tmpl

@@ -33,7 +33,6 @@ mode http
   bind    *:443 ssl no-sslv3 crt /etc/haproxy/certs
   reqadd  X-Forwarded-Proto:\ https
   rspadd  Strict-Transport-Security:\ max-age=15768000
-  rspidel Server
   rspidel X-Powered-By
 
   acl acme path_beg /.well-known/acme