2martens/vps-ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed accessing drone container

Browse Source
This commit is contained in:
2martens
2020-01-04 10:39:35 +01:00
parent eee3cfc71b
commit e7ead77124
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/drone/templates/etc/apache2/sites-available/ci_domain-le-ssl.conf.j2
+2
View File
@@ -14,6 +14,8 @@
# keep the host # keep the host
ProxyPreserveHost On ProxyPreserveHost On
RequestHeader set X-Forwarded-Proto "https"
RequestHeader set X-Forwarded-Host "{{ ci_domain }}"
ProxyPass / http://127.0.0.1:8000/ ProxyPass / http://127.0.0.1:8000/
ProxyPassReverse / http://127.0.0.1:8000/ ProxyPassReverse / http://127.0.0.1:8000/
roles/drone/templates/etc/drone/docker-compose.yml.j2
+3 -2
View File
@@ -5,14 +5,15 @@ services:
image: drone/drone:1 image: drone/drone:1
ports: ports:
- 8000:8000 - "8000:80"
- "8001:443"
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /var/lib/drone:/data - /var/lib/drone:/data
restart: always restart: always
environment: environment:
- DRONE_SERVER_HOST={{ ci_domain }} - DRONE_SERVER_HOST={{ ci_domain }}
- DRONE_SERVER_PROTO=http - DRONE_SERVER_PROTO=https
- DRONE_RUNNER_CAPACITY=2 - DRONE_RUNNER_CAPACITY=2
- DRONE_USER_CREATE=username:{{ gitea_user }},admin:true - DRONE_USER_CREATE=username:{{ gitea_user }},admin:true
- DRONE_GITEA_SERVER={{ gitea_url }} - DRONE_GITEA_SERVER={{ gitea_url }}