diff --git a/README.md b/README.md index 9aba6cbddd2f2289480c44f26ed808dfa55d966c..e74c608663da62d71138e79eb6f43dcff2fbe45d 100644 --- a/README.md +++ b/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. diff --git a/docker-compose.yml b/docker-compose.yml index 50be5a7464f963c0e5ce7e01d0f99ab843933c75..b513e2e8720585961a1933fa1447e17e1b249ddf 100644 --- a/docker-compose.yml +++ b/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/" diff --git a/templates/haproxy.cfg.tmpl b/templates/haproxy.cfg.tmpl index a90bf8d39d50773fc0ad8a7cd0aae0c2ea3f983c..f1986e712237479fc4ca807be57827bc50e190c7 100644 --- a/templates/haproxy.cfg.tmpl +++ b/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