Giles Bradshaw 4 months ago
parent
commit
6e3e34b14a
3 changed files with 14 additions and 10 deletions
  1. +0
    -2
      .drone-do.star
  2. +2
    -2
      docker-compose.yml
  3. +12
    -6
      letsencrypt-nginx/conf/git.conf

+ 0
- 2
.drone-do.star View File

@@ -12,8 +12,6 @@ def main(ctx):
stackName,
[
"docker service scale {name}_chat=1".format(name=stackName),
"docker service scale {name}_letsencrypt-drone=1".format(name=stackName),
"docker service scale {name}_letsencrypt-git=1".format(name=stackName),
]
)

+ 2
- 2
docker-compose.yml View File

@@ -6,7 +6,7 @@ services:
deploy:
placement:
constraints: [node.labels.com.sigyl.git-stack == yes]
replicas: 0
replicas: 1
restart_policy:
condition: any
image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-git
@@ -45,7 +45,7 @@ services:
deploy:
placement:
constraints: [node.labels.com.sigyl.git-stack == yes]
replicas: 0
replicas: 1
restart_policy:
condition: any
image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-drone


+ 12
- 6
letsencrypt-nginx/conf/git.conf View File

@@ -119,7 +119,8 @@
# root /www/data;

location ${GIT_LOCATION} {
proxy_pass ${PROXY_PASS};
set ${DOLLAR}upstream ${PROXY_PASS};
proxy_pass ${DOLLAR}upstream;
}
location ${BLOG_LOCATION} {
proxy_set_header Host ${DOLLAR}http_host;
@@ -127,7 +128,8 @@
proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme;
proxy_buffering off;
proxy_pass ${BLOG_PROXY_PASS};
set ${DOLLAR}upstream ${BLOG_PROXY_PASS};
proxy_pass ${DOLLAR}upstream;
}
location ${PORTAINER_LOCATION} {
proxy_set_header Host ${DOLLAR}http_host;
@@ -135,7 +137,8 @@
proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme;
proxy_buffering off;
proxy_pass ${PORTAINER_PROXY_PASS};
set ${DOLLAR}upstream ${PORTAINER_PROXY_PASS};
proxy_pass ${DOLLAR}upstream;
}

location ${CHAT_LOCATION}sockjs {
@@ -181,7 +184,8 @@
proxy_redirect off;
}
location ${REMOTE_LOCATION}websocket-tunnel {
proxy_pass ${REMOTE_PROXY_PASS}websocket-tunnel;
set ${DOLLAR}upstream ${REMOTE_PROXY_PASS}websocket-tunnel;
proxy_pass ${DOLLAR}upstream;
proxy_http_version 1.1;
proxy_set_header Upgrade ${DOLLAR}http_upgrade;
proxy_set_header Connection "Upgrade";
@@ -194,7 +198,8 @@

}
location ${REMOTE_LOCATION}websocket-tunnel/ {
proxy_pass ${REMOTE_PROXY_PASS}websocket-tunnel/;
set ${DOLLAR}upstream ${REMOTE_PROXY_PASS}websocket-tunnel/;
proxy_pass ${DOLLAR}upstream;
proxy_http_version 1.1;
proxy_set_header Upgrade ${DOLLAR}http_upgrade;
proxy_set_header Connection "Upgrade";
@@ -208,7 +213,8 @@
}

location ${REMOTE_LOCATION} {
proxy_pass ${REMOTE_PROXY_PASS};
set ${DOLLAR}upstream ${REMOTE_PROXY_PASS};
proxy_pass ${DOLLAR}upstream;
}
}