Verified Commit 4ced7ca5 authored by Debian's avatar Debian Committed by Loïc Dachary
Browse files

weblate: update to weblate 3.0.1

parent 48984009
......@@ -17,8 +17,7 @@ provisioner:
lint:
name: ansible-lint
env:
# https://github.com/metacloud/molecule/issues/1008 for why ../../.. and ../ only
ANSIBLE_ROLES_PATH: roles:../../../infrastructure/roles:../postfix/roles:../bind/roles:../icinga/roles:../backup/roles:../misc/roles:../packages/roles:../jdauphant.nginx/roles
ANSIBLE_ROLES_PATH: roles:../infrastructure/roles:../postfix/roles:../bind/roles:../icinga/roles:../backup/roles:../misc/roles:../packages/roles:../jdauphant.nginx/roles
inventory:
links:
# Path is relative to .molecule folder
......
---
WEBLATE_SERVER_EMAIL: admin@securedrop.club
WEBLATE_ADMIN_EMAIL: admin@securedrop.club
WEBLATE_SERVER_EMAIL: admin@enough.community
WEBLATE_ADMIN_EMAIL: admin@enough.community
WEBLATE_ADMIN_PASSWORD: admin
WEBLATE_DEFAULT_FROM_EMAIL: admin@securedrop.club
WEBLATE_DEFAULT_FROM_EMAIL: admin@enough.community
---
- name: recreate weblate
docker_service:
files: docker-compose-securedrop-club.yml
files: docker-compose-infrastructure.yml
project_src: /srv/weblate
state: present
......@@ -38,10 +38,10 @@
dest: /srv/weblate
become: False
- name: Copy docker-compose-securedrop-club.yml
- name: Copy docker-compose-infrastructure.yml
template:
src: docker-compose-securedrop-club.yml
dest: /srv/weblate/docker-compose-securedrop-club.yml
src: docker-compose-infrastructure.yml
dest: /srv/weblate/docker-compose-infrastructure.yml
owner: debian
mode: "0600"
notify:
......
*/5 * * * * cd /srv/weblate; flock --timeout 600 /tmp/weblate sudo docker-compose -f docker-compose-securedrop-club.yml run --rm weblate update_index
@daily cd /srv/weblate; flock --timeout 600 /tmp/weblate sudo docker-compose -f docker-compose-securedrop-club.yml run --rm weblate cleanuptrans
@hourly cd /srv/weblate; flock --timeout 600 /tmp/weblate sudo docker-compose -f docker-compose-securedrop-club.yml run --rm weblate commit_pending --all --age=1
*/5 * * * * cd /srv/weblate; flock --timeout 600 /tmp/weblate sudo docker-compose -f docker-compose-infrastructure.yml run --rm weblate update_index
@daily cd /srv/weblate; flock --timeout 600 /tmp/weblate sudo docker-compose -f docker-compose-infrastructure.yml run --rm weblate cleanuptrans
@hourly cd /srv/weblate; flock --timeout 600 /tmp/weblate sudo docker-compose -f docker-compose-infrastructure.yml run --rm weblate commit_pending --all --age=1
version: '2'
services:
weblate:
image: weblate/weblate:2.20-1
image: weblate/weblate:3.0.1-4
links:
- database
- cache
......@@ -39,8 +39,6 @@ services:
- WEBLATE_ALLOWED_HOSTS=*
{% endif %}
- WEBLATE_REGISTRATION_OPEN=1
- WEBLATE_SOCIAL_AUTH_GITHUB_KEY=ccd2a029302c4258d5fd
- WEBLATE_SOCIAL_AUTH_GITHUB_SECRET=eec7c91a552bdda745f8a5108738a4afbf888533
database:
image: postgres:9.6-alpine
env_file:
......@@ -49,8 +47,11 @@ services:
- postgres-data:/var/lib/postgresql/data
restart: always
cache:
image: memcached:1.5-alpine
image: redis:4-alpine
restart: always
command: ["redis-server", "--appendonly", "yes"]
volumes:
- redis-data:/data
{% if with_https is defined and with_https == true %}
https-portal:
image: steveltn/https-portal:1.2.4
......@@ -65,6 +66,8 @@ services:
{% endif %}
SERVER_NAMES_HASH_BUCKET_SIZE: 128
{% endif %}
PROXY_READ_TIMEOUT: 3600
volumes:
weblate-data: {}
postgres-data: {}
redis-data: {}
......@@ -13,7 +13,7 @@ def test_weblate_send_mail(host):
cmd = weblate_host.run("""
cd /srv/weblate
sudo docker-compose -f docker-compose-securedrop-club.yml exec -T weblate weblate sendtestemail loic+doomtofail@dachary.org
sudo docker-compose -f docker-compose-infrastructure.yml exec -T weblate weblate sendtestemail loic+doomtofail@dachary.org
""")
print(cmd.stdout)
print(cmd.stderr)
......
......@@ -12,10 +12,4 @@
http_vhost_uri: "/"
http_vhost_string: "Weblate"
- role: monitor_http_vhost
http_vhost_name: Weblate projects
http_vhost_fqdn: "weblate.{{ domain }}"
http_vhost_uri: "/projects/"
http_vhost_string: '<th><a href=\"/projects/securedrop/\">SecureDrop</a></th>'
become: True
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment