Compare commits

..

No commits in common. "559c68b2dfaef75d024e7d39158d2b9d1c3d6d75" and "d99d224c6b7b2148b986d83b4810667d55c24b67" have entirely different histories.

8 changed files with 14 additions and 18 deletions

View File

@ -99,7 +99,6 @@ services:
- traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`) - traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`)
- traefik.http.routers.{{ service }}-front.tls=true - traefik.http.routers.{{ service }}-front.tls=true
- traefik.http.routers.{{ service }}-front.tls.certresolver=lets-encrypt - traefik.http.routers.{{ service }}-front.tls.certresolver=lets-encrypt
- traefik.http.routers.{{ service }}-front.middlewares=cojedzie-compress@docker
- traefik.http.services.{{ service }}-front.loadbalancer.server.port=3000 - traefik.http.services.{{ service }}-front.loadbalancer.server.port=3000
volumes: volumes:

View File

@ -17,7 +17,7 @@ services:
replicas: 1 replicas: 1
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.routers.{{ service }}-api.rule=(Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`)) && (PathPrefix(`/api/`) || PathPrefix(`/bundles/`)) - traefik.http.routers.{{ service }}-api.rule=(Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`)) && PathPrefix(`/api/`)
- traefik.http.routers.{{ service }}-api.priority=100 - traefik.http.routers.{{ service }}-api.priority=100
- traefik.http.routers.{{ service }}-api.tls=true - traefik.http.routers.{{ service }}-api.tls=true
- traefik.http.routers.{{ service }}-api.tls.certresolver=lets-encrypt - traefik.http.routers.{{ service }}-api.tls.certresolver=lets-encrypt
@ -96,10 +96,8 @@ services:
replicas: 1 replicas: 1
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.middlewares.{{ service }}-compress.compress=true
- traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`) - traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`)
- traefik.http.routers.{{ service }}-front.tls=true - traefik.http.routers.{{ service }}-front.tls=true
- traefik.http.routers.{{ service }}-front.middlewares={{ service }}-compress@docker
- traefik.http.routers.{{ service }}-front.tls.certresolver=lets-encrypt - traefik.http.routers.{{ service }}-front.tls.certresolver=lets-encrypt
- traefik.http.services.{{ service }}-front.loadbalancer.server.port=3000 - traefik.http.services.{{ service }}-front.loadbalancer.server.port=3000

View File

@ -5,7 +5,7 @@ volumes:
services: services:
server: server:
image: gitea/gitea:1.15.0 image: gitea/gitea:1.14.2
environment: environment:
- USER_UID={{ git_user.uid }} - USER_UID={{ git_user.uid }}
- USER_GID={{ git_user.group }} - USER_GID={{ git_user.group }}

View File

@ -2,7 +2,7 @@ version: '{{ compose_version }}'
services: services:
agent: agent:
image: portainer/agent:2.9.0 image: portainer/agent:2.5.1
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /var/lib/docker/volumes:/var/lib/docker/volumes - /var/lib/docker/volumes:/var/lib/docker/volumes
@ -14,7 +14,7 @@ services:
constraints: [node.platform.os == linux] constraints: [node.platform.os == linux]
portainer: portainer:
image: portainer/portainer-ce:2.9.0 image: portainer/portainer-ce:2.5.1
command: -H tcp://tasks.agent:9001 --tlsskipverify command: -H tcp://tasks.agent:9001 --tlsskipverify
volumes: volumes:
- portainer_data:/data - portainer_data:/data

View File

@ -0,0 +1,8 @@
---
http:
routers:
nginx:
rule: Host(`{{ main_domain }}`)
service: legacy@docker
tls:
certresolver: lets-encrypt

View File

@ -2,7 +2,7 @@ version: "{{ compose_version }}"
services: services:
ingress: ingress:
image: traefik:v2.5 image: traefik:v2.4
ports: ports:
- 80:80 - 80:80
- 443:443 - 443:443

View File

@ -49,15 +49,6 @@ service_config:
6330386139356263390a663366633232346637346233653261373330343864613262313465336432 6330386139356263390a663366633232346637346233653261373330343864613262313465336432
31366633323433653632366633376533343764343565653737633837383330323630313433323836 31366633323433653632366633376533343764343565653737633837383330323630313433323836
6530363533656439663631636532363864373666343163376632 6530363533656439663631636532363864373666343163376632
- name: sobak
password: !vault |
$ANSIBLE_VAULT;1.1;AES256
31366430636665333631346565353666646333616436383062663261316537616566373334663061
3430376431363333613032643135646336333537633931640a656238613566656632626662343661
30313766313337663534323631333266633464623364613261613865326235306564616635613237
3861393364356136350a393433613066663535333934636664613164653139323166343030633566
36343734666637336665316231636631313633336331306633386665616337363166646132366133
6166376237646566656166386631303732633831323961363038
- name: docker-swarm - name: docker-swarm
password: !vault | password: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256