Compare commits

...

5 Commits

Author SHA1 Message Date
Kacper Donat
559c68b2df traefik: Remove unnecessary dynamic service 2021-10-05 22:10:18 +02:00
Kacper Donat
7deed6e719 registry: Add sobak as user 2021-10-05 22:10:18 +02:00
Kacper Donat
1e9ba5cbfa gitea, traefik, portainer: Update to latest versions 2021-10-05 22:10:18 +02:00
Kacper Donat
8a13da2995 cojedzie: Route /bundles/ to api service 2021-10-05 22:10:18 +02:00
Kacper Donat
55becf9d28 cojedzie: Add compression 2021-10-05 22:10:11 +02:00
8 changed files with 18 additions and 14 deletions

View File

@ -99,6 +99,7 @@ services:
- 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.certresolver=lets-encrypt
- traefik.http.routers.{{ service }}-front.middlewares=cojedzie-compress@docker
- traefik.http.services.{{ service }}-front.loadbalancer.server.port=3000
volumes:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -26,7 +26,7 @@ mysql_users:
- name: keylighter
priv: keylighter.*:ALL
host: '172.%'
password: !vault |
password: !vault |
$ANSIBLE_VAULT;1.1;AES256
63656537653463313639373130666537373365393866623031616265643762353739643965326132
3764653563333266616132393335613335363361633531660a373730363362666230363836393266

View File

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