diff --git a/dockerfiles/services/gitea/docker-compose.yml b/dockerfiles/services/gitea/docker-compose.yml index 338de67..a33d837 100644 --- a/dockerfiles/services/gitea/docker-compose.yml +++ b/dockerfiles/services/gitea/docker-compose.yml @@ -27,3 +27,8 @@ services: cpus: '0.5' memory: 96M + logging: + driver: fluentd + options: + fluentd-address: "logs.xai-corp.net:24224" + tag: gitea diff --git a/dockerfiles/services/letsencrypt/docker-compose-update.yml b/dockerfiles/services/letsencrypt/docker-compose-update.yml index ed4688b..caf3842 100644 --- a/dockerfiles/services/letsencrypt/docker-compose-update.yml +++ b/dockerfiles/services/letsencrypt/docker-compose-update.yml @@ -20,7 +20,7 @@ services: LETSENCRYPT_HTTPS_ENABLED: "false" LETSENCRYPT_TESTCERT: "false" LETSENCRYPT_DEBUG: "true" - LETSENCRYPT_JOB_TIME: "0 0 1 15 * *" + LETSENCRYPT_JOB_TIME: "0 0 1 */2 * *" LETSENCRYPT_DOMAIN1: xai-corp.net LETSENCRYPT_DOMAIN2: git.xai-corp.net LETSENCRYPT_DOMAIN3: xaibox.xai-corp.net diff --git a/dockerfiles/services/sslproxy/docker-compose-prod.yml b/dockerfiles/services/sslproxy/docker-compose-prod.yml index 4d2ec6c..d8101a1 100644 --- a/dockerfiles/services/sslproxy/docker-compose-prod.yml +++ b/dockerfiles/services/sslproxy/docker-compose-prod.yml @@ -19,12 +19,12 @@ services: # options: # syslog-address: "tcp+tls://logs6.papertrailapp.com:38577" # tag: "{{.Name}}/{{.ID}}" -# -# logging: -# driver: fluentd -# options: -# fluentd-address: "logs.xai-corp.net:24224" -# tag: sslproxy + + logging: + driver: fluentd + options: + fluentd-address: "logs.xai-corp.net:24224" + tag: sslproxy # logging: # driver: syslog @@ -34,10 +34,19 @@ services: deploy: mode: replicated - replicas: 1 + replicas: 3 restart_policy: condition: any delay: 5s max_attempts: 10 +# update_config: +# parallelism: 2 +# delay: 2s +# order: start-first + resources: + limits: + cpus: '0.1' + memory: 16M + labels: net.xai-corp.sslproxy.description: proxy ssl calls to non ssl containers diff --git a/dockerfiles/services/sslproxy/hosts/dkui.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/dkui.xai-corp.net.conf index df78772..c573ddb 100644 --- a/dockerfiles/services/sslproxy/hosts/dkui.xai-corp.net.conf +++ b/dockerfiles/services/sslproxy/hosts/dkui.xai-corp.net.conf @@ -1,6 +1,6 @@ # dkui.xai-corp.net server { - listen 443 ssl; + listen 443 ssl ipv6only=off; server_name dkui.xai-corp.net; ssl_certificate /etc/letsencrypt/live/xai-corp.net/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/xai-corp.net/privkey.pem; diff --git a/dockerfiles/services/sslproxy/hosts/fs.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/fs.xai-corp.net.conf index f311c45..b60ba79 100644 --- a/dockerfiles/services/sslproxy/hosts/fs.xai-corp.net.conf +++ b/dockerfiles/services/sslproxy/hosts/fs.xai-corp.net.conf @@ -1,6 +1,6 @@ # fs.xai-corp.net server { - listen 443 ssl; + listen 443 ssl ipv6only=off; server_name fs.xai-corp.net; ssl_certificate /etc/letsencrypt/live/xai-corp.net/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/xai-corp.net/privkey.pem; diff --git a/dockerfiles/services/sslproxy/hosts/git.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/git.xai-corp.net.conf index 21410b0..08c560e 100644 --- a/dockerfiles/services/sslproxy/hosts/git.xai-corp.net.conf +++ b/dockerfiles/services/sslproxy/hosts/git.xai-corp.net.conf @@ -1,6 +1,6 @@ # git.xai-corp.net server { - listen 443 ssl; + listen 443 ssl ipv6only=off; server_name git.xai-corp.net; ssl_certificate /etc/letsencrypt/live/xai-corp.net/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/xai-corp.net/privkey.pem; diff --git a/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf index f07d15a..620d0db 100644 --- a/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf +++ b/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf @@ -1,6 +1,6 @@ # xaibox.xai-corp.net server { - listen 443 ssl; + listen 443 ssl ipv6only=off; server_name xaibox.xai-corp.net; ssl_certificate /etc/letsencrypt/live/xai-corp.net/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/xai-corp.net/privkey.pem; diff --git a/dockerfiles/services/ui/docker-compose.yml b/dockerfiles/services/ui/docker-compose.yml index b1bcfad..02c540a 100644 --- a/dockerfiles/services/ui/docker-compose.yml +++ b/dockerfiles/services/ui/docker-compose.yml @@ -30,3 +30,9 @@ services: cpus: '0.2' memory: 16M + + logging: + driver: fluentd + options: + fluentd-address: "logs.xai-corp.net:24224" + tag: dkui