Revert "Fix YAML format issues"

This reverts commit babeef8226.

Instead of fixing the indentation of the recently introduced gitea
stuff, the indentation of the old stuff was changed.
This commit is contained in:
Alexander Dahl 2022-01-30 11:42:48 +01:00
parent 9b31fe0619
commit b1b3382728

View file

@ -71,156 +71,156 @@
site_name: "gitea.n39.eu" site_name: "gitea.n39.eu"
proxy_port: "{{ gitea_host_port }}" proxy_port: "{{ gitea_host_port }}"
- name: Ensure apt-cacher container is running - name: Ensure apt-cacher container is running
docker_container: docker_container:
name: apt_cacher_ng name: apt_cacher_ng
image: "mrtux/apt-cacher-ng" image: "mrtux/apt-cacher-ng"
pull: true pull: true
state: started state: started
restart_policy: unless-stopped restart_policy: unless-stopped
detach: yes detach: yes
ports: ports:
- 3142:3142 - 3142:3142
- name: Ensure the mosquitto directories exist - name: Ensure the mosquitto directories exist
file: file:
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
with_items: with_items:
- "{{ mosquitto_data }}/config" - "{{ mosquitto_data }}/config"
- "{{ mosquitto_data }}/data" - "{{ mosquitto_data }}/data"
- "{{ mosquitto_data }}/log" - "{{ mosquitto_data }}/log"
- name: Make sure mosquitto config is there - name: Make sure mosquitto config is there
template: template:
src: "templates/mosquitto.conf.j2" src: "templates/mosquitto.conf.j2"
dest: "{{ mosquitto_data }}/config/mosquitto.conf" dest: "{{ mosquitto_data }}/config/mosquitto.conf"
notify: restart_mosquitto notify: restart_mosquitto
- name: Ensure mosquitto is running - name: Ensure mosquitto is running
docker_container: docker_container:
name: mosquitto name: mosquitto
image: "{{ mosquitto_image }}" image: "{{ mosquitto_image }}"
pull: true pull: true
state: started state: started
ports: ports:
- 1883:1883 - 1883:1883
- 9001:9001 - 9001:9001
volumes: volumes:
- "{{ mosquitto_data }}/config:/mosquitto/config" - "{{ mosquitto_data }}/config:/mosquitto/config"
- "{{ mosquitto_data }}/data:/mosquitto/data" - "{{ mosquitto_data }}/data:/mosquitto/data"
- "{{ mosquitto_data }}/log:/mosquitto/log" - "{{ mosquitto_data }}/log:/mosquitto/log"
detach: yes detach: yes
keep_volumes: yes keep_volumes: yes
restart_policy: unless-stopped restart_policy: unless-stopped
- name: Ensure the openhab directories exist - name: Ensure the openhab directories exist
file: file:
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
with_items: with_items:
- "{{ openhab_data }}/addons" - "{{ openhab_data }}/addons"
- "{{ openhab_data }}/conf" - "{{ openhab_data }}/conf"
- "{{ openhab_data }}/userdata" - "{{ openhab_data }}/userdata"
- name: Clone or update configuration - name: Clone or update configuration
git: git:
repo: "{{ openhab_configuration_source }}" repo: "{{ openhab_configuration_source }}"
version: "{{ openhab_configuration_version }}" version: "{{ openhab_configuration_version }}"
dest: "{{ openhab_data }}/conf" dest: "{{ openhab_data }}/conf"
clone: yes clone: yes
update: yes update: yes
- name: ensure openhab is up and running - name: ensure openhab is up and running
docker_container: docker_container:
name: openhab name: openhab
image: "{{ openhab_image }}" image: "{{ openhab_image }}"
pull: true pull: true
state: started state: started
detach: yes detach: yes
interactive: yes interactive: yes
tty: yes tty: yes
ports: ports:
- "{{ openhab_host_port }}:8080" - "{{ openhab_host_port }}:8080"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
- "{{ openhab_data }}/addons:/openhab/addons:rw" - "{{ openhab_data }}/addons:/openhab/addons:rw"
- "{{ openhab_data }}/conf:/openhab/conf:rw" - "{{ openhab_data }}/conf:/openhab/conf:rw"
- "{{ openhab_data }}/userdata:/openhab/userdata:rw" - "{{ openhab_data }}/userdata:/openhab/userdata:rw"
keep_volumes: yes keep_volumes: yes
restart_policy: unless-stopped restart_policy: unless-stopped
env: EXTRA_JAVA_OPTS="-Duser.timezone=Europe/Berlin" env: EXTRA_JAVA_OPTS="-Duser.timezone=Europe/Berlin"
- name: Setup proxy site openhab.n39.eu - name: Setup proxy site openhab.n39.eu
include_role: include_role:
name: setup-http-site-proxy name: setup-http-site-proxy
vars: vars:
site_name: openhab.n39.eu site_name: openhab.n39.eu
proxy_port: "{{ openhab_host_port }}" proxy_port: "{{ openhab_host_port }}"
- name: Ensure container for URI tools is running - name: Ensure container for URI tools is running
docker_container: docker_container:
name: uritools name: uritools
image: mrtux/clean_uri image: mrtux/clean_uri
pull: true pull: true
state: started state: started
detach: yes detach: yes
ports: ports:
- "{{ uritools_host_port }}:8080" - "{{ uritools_host_port }}:8080"
restart_policy: unless-stopped restart_policy: unless-stopped
- name: Setup proxy site uritools.n39.eu - name: Setup proxy site uritools.n39.eu
include_role: include_role:
name: setup-http-site-proxy name: setup-http-site-proxy
vars: vars:
site_name: uritools.n39.eu site_name: uritools.n39.eu
proxy_port: "{{ uritools_host_port }}" proxy_port: "{{ uritools_host_port }}"
- name: Ensure container for entities validation service is running - name: Ensure container for entities validation service is running
docker_container: docker_container:
name: entities_validation_svc name: entities_validation_svc
image: netz39/entities_validation_svc:v1.0.0 image: netz39/entities_validation_svc:v1.0.0
pull: true pull: true
state: started state: started
detach: yes detach: yes
ports: ports:
- "{{ entities_validation_svc_host_port }}:8080" - "{{ entities_validation_svc_host_port }}:8080"
restart_policy: unless-stopped restart_policy: unless-stopped
- name: Setup proxy site entities-validation.svc.n39.eu - name: Setup proxy site entities-validation.svc.n39.eu
include_role: include_role:
name: setup-http-site-proxy name: setup-http-site-proxy
vars: vars:
site_name: entities-validation.svc.n39.eu site_name: entities-validation.svc.n39.eu
proxy_port: "{{ entities_validation_svc_host_port }}" proxy_port: "{{ entities_validation_svc_host_port }}"
- name: Ensure container for shlink is running - name: Ensure container for shlink is running
docker_container: docker_container:
name: shlink name: shlink
image: shlinkio/shlink:2.6.2 image: shlinkio/shlink:2.6.2
pull: true pull: true
state: started state: started
detach: yes detach: yes
ports: ports:
- "{{ shlink_host_port }}:8080" - "{{ shlink_host_port }}:8080"
restart_policy: unless-stopped restart_policy: unless-stopped
env: env:
SHORT_DOMAIN_HOST: "{{ shlink_domain_name }}" SHORT_DOMAIN_HOST: "{{ shlink_domain_name }}"
SHORT_DOMAIN_SCHEMA: https SHORT_DOMAIN_SCHEMA: https
GEOLITE_LICENSE_KEY: "{{ shlink_geolite_license_key }}" GEOLITE_LICENSE_KEY: "{{ shlink_geolite_license_key }}"
- name: Setup proxy site {{ shlink_domain_name }} - name: Setup proxy site {{ shlink_domain_name }}
include_role: include_role:
name: setup-http-site-proxy name: setup-http-site-proxy
vars: vars:
site_name: "{{ shlink_domain_name }}" site_name: "{{ shlink_domain_name }}"
proxy_port: "{{ shlink_host_port }}" proxy_port: "{{ shlink_host_port }}"
handlers: handlers:
- name: restart mosquitto - name: restart mosquitto
docker_container: docker_container:
name: mosquitto name: mosquitto
state: started state: started
restart: yes restart: yes