Add default, shorten start check and remove outdated cruft

This commit is contained in:
Luke Murphy 2020-07-05 02:34:56 +02:00
parent a226cfb0be
commit 8947e3a528
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
2 changed files with 2 additions and 10 deletions

View File

@ -30,7 +30,7 @@ services:
interval: 15s
timeout: 10s
retries: 10
start_period: 30s
start_period: 15s
deploy:
update_config:
failure_action: rollback
@ -41,7 +41,7 @@ services:
- "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)"
- "traefik.http.routers.gitea.entrypoints=web-secure"
- "traefik.http.services.gitea.loadbalancer.server.port=3000"
- "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV:production}"
- "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
- "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh"

View File

@ -1,13 +1,5 @@
#!/bin/bash
create-secrets () {
pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}" -
pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}" -
pwgen -n 105 1 | docker secret create "${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION}" -
pwgen -n 43 1 | docker secret create "${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION}" -
pwgen -n 64 1 | docker secret create "${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}" -
}
create-admin () {
container=$(docker container ls -f "name=${STACK_NAME}_gitea" -q)
docker exec "$container" \