diff --git a/files/docker-compose.yml b/files/docker-compose.yml index 73c7440..9e99214 100644 --- a/files/docker-compose.yml +++ b/files/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.3" services: gitea: - image: gitea/gitea:1.11 + image: gitea/gitea:1.12 restart: always volumes: - ./volumes/gitea:/data @@ -17,12 +17,12 @@ services: - postfix weblate: - image: weblate/weblate:3.11.2-1 + image: weblate/weblate:4.1-2 restart: always ports: - 127.0.0.1:3001:8080 environment: - - WEBLATE_EMAIL_HOST=postfixx + - WEBLATE_EMAIL_HOST=postfix - WEBLATE_EMAIL_USE_TLS=0 - WEBLATE_ALLOWED_HOSTS=${WEBLATE_HOSTNAME},127.0.0.1 - WEBLATE_ADMIN_PASSWORD=${WEBLATE_ADMIN_PASSWORD} @@ -35,7 +35,8 @@ services: - POSTGRES_PASSWORD=${WEBLATE_POSTGRES_PASSWORD} - POSTGRES_USER=weblate - POSTGRES_DATABASE=weblate - - POSTGRES_HOST=postgress + - POSTGRES_HOST=postgres + - POSTGRES_PORT=5432 volumes: - ./volumes/weblate:/app/data depends_on: diff --git a/gitea.yml b/gitea.yml index 2c3e132..2fa41a5 100644 --- a/gitea.yml +++ b/gitea.yml @@ -16,14 +16,14 @@ tasks: - name: create app folder - file: path={{item.path}} owner={{item.owner}} group={{item.owner}} state=directory mode='0755' + file: path={{item.path}} state=directory with_items: - - { path: '/gitea/', owner: 'root' } - - { path: '/gitea/volumes/', owner: 'root' } - - { path: '/gitea/volumes/gitea/', owner: 'root' } - - { path: '/gitea/volumes/redis/', owner: 'root' } - - { path: '/gitea/volumes/weblate/', owner: '1000' } - - { path: '/gitea/volumes/postgres/', owner: 'root' } + - { path: '/gitea/' } + - { path: '/gitea/volumes/' } + - { path: '/gitea/volumes/gitea/' } + - { path: '/gitea/volumes/redis/' } + - { path: '/gitea/volumes/weblate/' } + - { path: '/gitea/volumes/postgres/' } - name: add all templates template: src={{item.src}} dest={{item.dest}} mode={{item.mode}} @@ -81,7 +81,7 @@ - name: renew weblate certificates cron: special_time=daily - name=certbot-renew-gitea + name=certbot-renew-weblate user=root job="certbot certonly --nginx -d weblate.{{ domain }} -n --deploy-hook 'nginx -s reload'"