Added more variables to the roles

ansible/roles/blog/defaults/main.yml

@@ -0,0 +1,2 @@
+blog_domain: blog.gitea.io
+blog_container: gitea/blog:latest

ansible/roles/blog/templates/service.j2

@@ -11,13 +11,13 @@ EnvironmentFile=/etc/default/blog
 ExecStop=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker stop %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker kill %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps -a | /bin/grep %p 1> /dev/null && /usr/bin/docker rm %p || true'
-ExecStartPre=/usr/bin/docker pull gitea/blog:latest
+ExecStartPre=/usr/bin/docker pull {{ blog_container }}
 
 ExecStart=/usr/bin/docker run --rm \
   --name %p \
-  --hostname blog.gitea.io \
-  --label traefik.frontend.rule=Host:blog.gitea.io \
-  gitea/blog:latest
+  --hostname {{ blog_domain }} \
+  --label traefik.frontend.rule=Host:{{ blog_domain }} \
+  {{ blog_container }}
 
 [Install]
 WantedBy=multi-user.target

ansible/roles/coverage/defaults/main.yml

@@ -0,0 +1,5 @@
+coverage_container: aircover/aircover:latest
+coverage_domain: coverage.gitea.io
+coverage_debug: true
+coverage_teams: go-gitea
+coverage_admins: tboerger,lunny,bkcsoft

ansible/roles/coverage/templates/default.j2

@@ -1,3 +1,3 @@
-COVERAGE_DEBUG=true
-COVERAGE_TEAMS=go-gitea
-COVERAGE_ADMINS=tboerger,lunny,bkcsoft
+COVERAGE_DEBUG={{ coverage_debug }}
+COVERAGE_TEAMS={{ coverage_teams }}
+COVERAGE_ADMINS={{ coverage_admins }}

ansible/roles/coverage/templates/service.j2

@@ -12,19 +12,19 @@ EnvironmentFile=/etc/default/coverage
 ExecStop=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker stop %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker kill %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps -a | /bin/grep %p 1> /dev/null && /usr/bin/docker rm %p || true'
-ExecStartPre=/usr/bin/docker pull aircover/aircover:latest
+ExecStartPre=/usr/bin/docker pull {{ coverage_container }}
 
 ExecStart=/usr/bin/docker run --rm \
   --name %p \
-  --hostname coverage.gitea.io \
-  --label traefik.frontend.rule=Host:coverage.gitea.io \
+  --hostname {{ coverage_domain }} \
+  --label traefik.frontend.rule=Host:{{ coverage_domain }} \
   --volume /var/lib/coverage:/var/lib/aircover \
   --env GITHUB_CLIENT=${COVERAGE_GITHUB_CLIENT} \
   --env GITHUB_SECRET=${COVERAGE_GITHUB_SECRET} \
   --env TEAMS=${COVERAGE_TEAMS} \
   --env ADMINS=${COVERAGE_ADMINS} \
   --env DEBUG=${COVERAGE_DEBUG} \
-  aircover/aircover:latest
+  {{ coverage_container }}
 
 [Install]
 WantedBy=multi-user.target

ansible/roles/docker-gc/defaults/main.yml

@@ -0,0 +1,2 @@
+docker_gc_container: spotify/docker-gc
+docker_gc_interval: daily

ansible/roles/docker-gc/templates/service.j2

@@ -9,4 +9,4 @@ Type=oneshot
 
 ExecStart=/usr/bin/docker run --rm \
   --volume /var/run/docker.sock:/var/run/docker.sock \
-  spotify/docker-gc
+  {{ docker_gc_container }}

ansible/roles/docker-gc/templates/timer.j2

@@ -2,7 +2,7 @@
 Description=Docker GC
 
 [Timer]
-OnCalendar=daily
+OnCalendar={{ docker_gc_interval }}
 Persistent=true
 
 [Install]

ansible/roles/docker/defaults/main.yml

@@ -3,3 +3,5 @@ docker_packages:
 
 docker_services:
   - docker
+
+docker_opts:

ansible/roles/docker/templates/default.j2

@@ -1 +1 @@
-DOCKER_OPTS=""
+DOCKER_OPTS="{{ docker_opts }}"

ansible/roles/docs/defaults/main.yml

@@ -0,0 +1,2 @@
+docs_domain: docs.gitea.io
+docs_container: gitea/docs:latest

ansible/roles/docs/templates/service.j2

@@ -11,13 +11,13 @@ EnvironmentFile=/etc/default/docs
 ExecStop=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker stop %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker kill %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps -a | /bin/grep %p 1> /dev/null && /usr/bin/docker rm %p || true'
-ExecStartPre=/usr/bin/docker pull gitea/docs:latest
+ExecStartPre=/usr/bin/docker pull {{ docs_container }}
 
 ExecStart=/usr/bin/docker run --rm \
   --name %p \
-  --hostname blog.gitea.io \
-  --label traefik.frontend.rule=Host:docs.gitea.io \
-  gitea/docs:latest
+  --hostname {{ docs_domain }} \
+  --label traefik.frontend.rule=Host:{{ docs_domain }} \
+  {{ docs_container }}
 
 [Install]
 WantedBy=multi-user.target

ansible/roles/lgtm/defaults/main.yml

@@ -0,0 +1,3 @@
+lgtm_container: lgtm/lgtm:latest
+lgtm_domain: lgtm.gitea.io
+lgtm_debug: true

ansible/roles/lgtm/templates/default.j2

@@ -1 +1 @@
-LGTM_DEBUG=true
+LGTM_DEBUG={{ lgtm_debug }}

ansible/roles/lgtm/templates/service.j2

@@ -12,17 +12,17 @@ EnvironmentFile=/etc/default/lgtm
 ExecStop=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker stop %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker kill %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps -a | /bin/grep %p 1> /dev/null && /usr/bin/docker rm %p || true'
-ExecStartPre=/usr/bin/docker pull lgtm/lgtm:latest
+ExecStartPre=/usr/bin/docker pull {{ lgtm_container }}
 
 ExecStart=/usr/bin/docker run --rm \
   --name %p \
-  --hostname lgtm.gitea.io \
-  --label traefik.frontend.rule=Host:lgtm.gitea.io \
+  --hostname {{ lgtm_domain }} \
+  --label traefik.frontend.rule=Host:{{ lgtm_domain }} \
   --volume /var/lib/lgtm:/var/lib/lgtm \
   --env GITHUB_CLIENT=${LGTM_GITHUB_CLIENT} \
   --env GITHUB_SECRET=${LGTM_GITHUB_SECRET} \
   --env DEBUG=${LGTM_DEBUG} \
-  lgtm/lgtm:latest
+  {{ lgtm_container }}
 
 [Install]
 WantedBy=multi-user.target

ansible/roles/traefik/defaults/main.yml

@@ -0,0 +1,3 @@
+traefik_container: containous:traefik:latest
+traefik_domain: gitea.io
+traefik_email: info@gitea.io

ansible/roles/traefik/templates/service.j2

@@ -11,18 +11,18 @@ EnvironmentFile=/etc/default/traefik
 ExecStop=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker stop %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker kill %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps -a | /bin/grep %p 1> /dev/null && /usr/bin/docker rm %p || true'
-ExecStartPre=/usr/bin/docker pull containous/traefik:latest
+ExecStartPre=/usr/bin/docker pull {{ traefik_container }}
 
 ExecStart=/usr/bin/docker run --rm \
   --name %p \
-  --hostname server.gitea.io \
+  --hostname {{ traefik_domain }} \
   --label traefik.enable=false \
   --volume /etc/acme.json:/etc/acme.json \
   --volume /etc/traefik.toml:/etc/traefik.toml \
   --volume /var/run/docker.sock:/var/run/docker.sock \
   --publish 443:443 \
   --publish 80:80 \
-  containous/traefik:latest -c /etc/traefik.toml
+  {{ traefik_container }} -c /etc/traefik.toml
 
 [Install]
 WantedBy=multi-user.target

ansible/roles/traefik/templates/traefik.j2

@@ -11,11 +11,11 @@ logLevel = "INFO"
     [entryPoints.https.tls]
 
 [acme]
-email = "info@gitea.io"
+email = "{{ traefik_email }}"
 storageFile = "/etc/acme.json"
 entryPoint = "https"
 onDemand = true
 
 [docker]
-domain = "gitea.io"
+domain = "{{ traefik_domain }}"
 watch = true

ansible/roles/watchtower/defaults/main.yml

@@ -0,0 +1,2 @@
+watchtower_container: webhippie/watchtower:latest
+watchtower_cleanup: true

ansible/roles/watchtower/templates/default.j2

@@ -1 +1 @@
-WATCHTOWER_CLEANUP=true
+WATCHTOWER_CLEANUP={{ watchtower_cleanup }}

ansible/roles/watchtower/templates/service.j2

@@ -11,15 +11,15 @@ EnvironmentFile=/etc/default/watchtower
 ExecStop=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker stop %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker kill %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps -a | /bin/grep %p 1> /dev/null && /usr/bin/docker rm %p || true'
-ExecStartPre=/usr/bin/docker pull webhippie/watchtower:latest
+ExecStartPre=/usr/bin/docker pull {{ watchtower_container }}
 
 ExecStart=/usr/bin/docker run --rm \
   --name %p \
-  --hostname watchtower.gitea.io \
+  --hostname %p \
   --label traefik.enable=false \
   --volume /var/run/docker.sock:/var/run/docker.sock \
-  --env WATCHTOWER_CLEANUP=$WATCHTOWER_CLEANUP \
-  webhippie/watchtower:latest
+  --env WATCHTOWER_CLEANUP=${WATCHTOWER_CLEANUP} \
+  {{ watchtower_container }}
 
 [Install]
 WantedBy=multi-user.target

ansible/roles/website/defaults/main.yml

@@ -0,0 +1,2 @@
+website_domain: gitea.io
+website_container: gitea/website:latest

ansible/roles/website/templates/service.j2

@@ -11,13 +11,13 @@ EnvironmentFile=/etc/default/website
 ExecStop=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker stop %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps | /bin/grep %p 1> /dev/null && /usr/bin/docker kill %p || true'
 ExecStartPre=/bin/sh -c '/usr/bin/docker ps -a | /bin/grep %p 1> /dev/null && /usr/bin/docker rm %p || true'
-ExecStartPre=/usr/bin/docker pull gitea/website:latest
+ExecStartPre=/usr/bin/docker pull {{ website_container }}
 
 ExecStart=/usr/bin/docker run --rm \
   --name %p \
-  --hostname gitea.io \
-  --label traefik.frontend.rule=Host:gitea.io \
-  gitea/website:latest
+  --hostname {{ website_domain }} \
+  --label traefik.frontend.rule=Host:{{ website_domain }} \
+  {{ website_container }}
 
 [Install]
 WantedBy=multi-user.target