diff --git a/roles/drone/templates/etc/apache2/sites-available/ci_domain-le-ssl.conf.j2 b/roles/drone/templates/etc/apache2/sites-available/ci_domain-le-ssl.conf.j2 index f51298c..2f355e2 100644 --- a/roles/drone/templates/etc/apache2/sites-available/ci_domain-le-ssl.conf.j2 +++ b/roles/drone/templates/etc/apache2/sites-available/ci_domain-le-ssl.conf.j2 @@ -14,6 +14,8 @@ # keep the host ProxyPreserveHost On + RequestHeader set X-Forwarded-Proto "https" + RequestHeader set X-Forwarded-Host "{{ ci_domain }}" ProxyPass / http://127.0.0.1:8000/ ProxyPassReverse / http://127.0.0.1:8000/ diff --git a/roles/drone/templates/etc/drone/docker-compose.yml.j2 b/roles/drone/templates/etc/drone/docker-compose.yml.j2 index d3e8e34..779429f 100644 --- a/roles/drone/templates/etc/drone/docker-compose.yml.j2 +++ b/roles/drone/templates/etc/drone/docker-compose.yml.j2 @@ -5,14 +5,15 @@ services: image: drone/drone:1 ports: - - 8000:8000 + - "8000:80" + - "8001:443" volumes: - /var/run/docker.sock:/var/run/docker.sock - /var/lib/drone:/data restart: always environment: - DRONE_SERVER_HOST={{ ci_domain }} - - DRONE_SERVER_PROTO=http + - DRONE_SERVER_PROTO=https - DRONE_RUNNER_CAPACITY=2 - DRONE_USER_CREATE=username:{{ gitea_user }},admin:true - DRONE_GITEA_SERVER={{ gitea_url }}