Update yamllint to fix dependency issue
I think this still validates everything we need it to
This commit is contained in:
parent
db68c107d0
commit
c5215e330b
19 changed files with 30 additions and 29 deletions
|
@ -1,10 +1,11 @@
|
||||||
skip_list:
|
skip_list:
|
||||||
- 305
|
- command-instead-of-shell
|
||||||
- 401
|
- no-handler
|
||||||
- 301
|
- git-latest
|
||||||
- 503
|
|
||||||
|
|
||||||
exclude_paths:
|
exclude_paths:
|
||||||
- ansible/galaxy_roles/
|
- ansible/galaxy_roles/
|
||||||
- ansible/galaxy_collections/
|
- ansible/galaxy_collections/
|
||||||
- ~/.ansible
|
- ~/.ansible
|
||||||
|
- roles/nebula/files/nebula.yml
|
||||||
|
- roles/traefik/files/traefik.yml
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
ansible-lint==4.3.5
|
ansible-lint==5.3.2
|
||||||
yamllint==1.24.2
|
yamllint==1.24.2
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
TZ: Europe/London
|
timezone: Europe/London # noqa var-naming
|
||||||
|
|
||||||
# HACK: Some of the hostnames aren't valid dict keys
|
# HACK: Some of the hostnames aren't valid dict keys
|
||||||
hostname_slug: "{{ ansible_hostname | replace('-', '_') }}"
|
hostname_slug: "{{ ansible_hostname | replace('-', '_') }}"
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
- role: geerlingguy.ntp
|
- role: geerlingguy.ntp
|
||||||
become: true
|
become: true
|
||||||
vars:
|
vars:
|
||||||
ntp_timezone: "{{ TZ }}"
|
ntp_timezone: "{{ timezone }}"
|
||||||
ntp_manage_config: true
|
ntp_manage_config: true
|
||||||
|
|
||||||
- hosts:
|
- hosts:
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
src: files/sshd_config
|
src: files/sshd_config
|
||||||
dest: /etc/ssh/sshd_config
|
dest: /etc/ssh/sshd_config
|
||||||
validate: /usr/sbin/sshd -t -f %s
|
validate: /usr/sbin/sshd -t -f %s
|
||||||
backup: yes
|
backup: true
|
||||||
mode: 0644
|
mode: 0644
|
||||||
become: true
|
become: true
|
||||||
register: sshd_config
|
register: sshd_config
|
||||||
|
|
|
@ -4,7 +4,7 @@ services:
|
||||||
grafana:
|
grafana:
|
||||||
image: grafana/grafana:latest
|
image: grafana/grafana:latest
|
||||||
environment:
|
environment:
|
||||||
- TZ={{ TZ }}
|
- TZ={{ timezone }}
|
||||||
- GF_DATABASE_URL=postgres://grafana:grafana@db/grafana
|
- GF_DATABASE_URL=postgres://grafana:grafana@db/grafana
|
||||||
- GF_RENDERING_SERVER_URL=http://renderer:8081/render
|
- GF_RENDERING_SERVER_URL=http://renderer:8081/render
|
||||||
- GF_RENDERING_CALLBACK_URL=http://grafana:3000/
|
- GF_RENDERING_CALLBACK_URL=http://grafana:3000/
|
||||||
|
@ -42,7 +42,7 @@ services:
|
||||||
image: grafana/grafana-image-renderer:latest
|
image: grafana/grafana-image-renderer:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
- BROWSER_TZ={{ TZ }}
|
- BROWSER_TZ={{ timezone }}
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
src: files/wireguard-server.conf
|
src: files/wireguard-server.conf
|
||||||
dest: /etc/wireguard/wg0.conf
|
dest: /etc/wireguard/wg0.conf
|
||||||
mode: "0600"
|
mode: "0600"
|
||||||
backup: yes
|
backup: true
|
||||||
become: true
|
become: true
|
||||||
register: wireguard_conf
|
register: wireguard_conf
|
||||||
|
|
||||||
|
@ -41,9 +41,9 @@
|
||||||
sysctl:
|
sysctl:
|
||||||
name: net.ipv4.ip_forward
|
name: net.ipv4.ip_forward
|
||||||
value: "1"
|
value: "1"
|
||||||
sysctl_set: yes
|
sysctl_set: true
|
||||||
state: present
|
state: present
|
||||||
reload: yes
|
reload: true
|
||||||
sysctl_file: /etc/sysctl.d/99-sysctl.conf
|
sysctl_file: /etc/sysctl.d/99-sysctl.conf
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ nginx['ssl_certificate'] = "/etc/ssl/certs/ssl-cert-snakeoil.pem"
|
||||||
nginx['ssl_certificate_key'] = "/etc/ssl/private/ssl-cert-snakeoil.key"
|
nginx['ssl_certificate_key'] = "/etc/ssl/private/ssl-cert-snakeoil.key"
|
||||||
letsencrypt['enable'] = false
|
letsencrypt['enable'] = false
|
||||||
|
|
||||||
gitlab_rails['time_zone'] = '{{ TZ }}'
|
gitlab_rails['time_zone'] = '{{ timezone }}'
|
||||||
|
|
||||||
# https://docs.gitlab.com/omnibus/settings/memory_constrained_envs.html
|
# https://docs.gitlab.com/omnibus/settings/memory_constrained_envs.html
|
||||||
puma['worker_processes'] = 2
|
puma['worker_processes'] = 2
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
sysctl:
|
sysctl:
|
||||||
name: net.ipv4.ip_forward
|
name: net.ipv4.ip_forward
|
||||||
value: "1"
|
value: "1"
|
||||||
sysctl_set: yes
|
sysctl_set: true
|
||||||
state: present
|
state: present
|
||||||
reload: yes
|
reload: true
|
||||||
sysctl_file: /etc/sysctl.d/99-sysctl.conf
|
sysctl_file: /etc/sysctl.d/99-sysctl.conf
|
||||||
become: true
|
become: true
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
unarchive:
|
unarchive:
|
||||||
src: https://github.com/slackhq/nebula/releases/download/v{{ nebula_version }}/nebula-linux-amd64.tar.gz
|
src: https://github.com/slackhq/nebula/releases/download/v{{ nebula_version }}/nebula-linux-amd64.tar.gz
|
||||||
dest: /usr/bin
|
dest: /usr/bin
|
||||||
remote_src: yes
|
remote_src: true
|
||||||
mode: "0755"
|
mode: "0755"
|
||||||
become: true
|
become: true
|
||||||
notify: restart nebula
|
notify: restart nebula
|
||||||
|
|
|
@ -4,7 +4,7 @@ services:
|
||||||
privatebin:
|
privatebin:
|
||||||
image: privatebin/nginx-fpm-alpine:latest
|
image: privatebin/nginx-fpm-alpine:latest
|
||||||
environment:
|
environment:
|
||||||
- TZ={{ TZ }}
|
- TZ={{ timezone }}
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ app_data_dir }}/privatebin/:/srv/data"
|
- "{{ app_data_dir }}/privatebin/:/srv/data"
|
||||||
- "{{ app_data_dir }}/privatebin/conf.php:/srv/cfg/conf.php:ro"
|
- "{{ app_data_dir }}/privatebin/conf.php:/srv/cfg/conf.php:ro"
|
||||||
|
|
|
@ -5,7 +5,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- PUID={{ docker_user.id }}
|
- PUID={{ docker_user.id }}
|
||||||
- PGID={{ docker_user.id }}
|
- PGID={{ docker_user.id }}
|
||||||
- TZ={{ TZ }}
|
- TZ={{ timezone }}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/tank/app-data/calibre:/config
|
- /mnt/tank/app-data/calibre:/config
|
||||||
|
|
|
@ -5,7 +5,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- PUID={{ docker_user.id }}
|
- PUID={{ docker_user.id }}
|
||||||
- PGID={{ docker_user.id }}
|
- PGID={{ docker_user.id }}
|
||||||
- TZ={{ TZ }}
|
- TZ={{ timezone }}
|
||||||
ports:
|
ports:
|
||||||
- 33377:80
|
- 33377:80
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
|
@ -6,7 +6,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- PUID={{ docker_user.id }}
|
- PUID={{ docker_user.id }}
|
||||||
- PGID={{ docker_user.id }}
|
- PGID={{ docker_user.id }}
|
||||||
- TZ={{ TZ }}
|
- TZ={{ timezone }}
|
||||||
- DOCKER_MODS=theorangeone/lsio-mod-more-processes:latest
|
- DOCKER_MODS=theorangeone/lsio-mod-more-processes:latest
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ app_data_dir }}/nextcloud/apps:/config/www/nextcloud/apps"
|
- "{{ app_data_dir }}/nextcloud/apps:/config/www/nextcloud/apps"
|
||||||
|
|
|
@ -5,7 +5,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- PUID={{ docker_user.id }}
|
- PUID={{ docker_user.id }}
|
||||||
- PGID={{ docker_user.id }}
|
- PGID={{ docker_user.id }}
|
||||||
- TZ={{ TZ }}
|
- TZ={{ timezone }}
|
||||||
- DB_BACKEND=PostgreSQL
|
- DB_BACKEND=PostgreSQL
|
||||||
- DB_PGSQL_USERNAME=quassel
|
- DB_PGSQL_USERNAME=quassel
|
||||||
- DB_PGSQL_PASSWORD=quassel
|
- DB_PGSQL_PASSWORD=quassel
|
||||||
|
|
|
@ -6,7 +6,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- PUID={{ docker_user.id }}
|
- PUID={{ docker_user.id }}
|
||||||
- PGID={{ docker_user.id }}
|
- PGID={{ docker_user.id }}
|
||||||
- TZ={{ TZ }}
|
- TZ={{ timezone }}
|
||||||
- DOCKER_MODS=theorangeone/lsio-mod-more-processes:latest
|
- DOCKER_MODS=theorangeone/lsio-mod-more-processes:latest
|
||||||
|
|
||||||
- TTRSS_DB_USER=tt-rss
|
- TTRSS_DB_USER=tt-rss
|
||||||
|
|
|
@ -5,7 +5,7 @@ services:
|
||||||
command: /entrypoint.sh
|
command: /entrypoint.sh
|
||||||
user: "{{ docker_user.id }}"
|
user: "{{ docker_user.id }}"
|
||||||
environment:
|
environment:
|
||||||
- TZ={{ TZ }}
|
- TZ={{ timezone }}
|
||||||
- GITHUB_COM_TOKEN={{ renovate_github_token }}
|
- GITHUB_COM_TOKEN={{ renovate_github_token }}
|
||||||
- DOCKER_HOST=tcp://docker_proxy:2375
|
- DOCKER_HOST=tcp://docker_proxy:2375
|
||||||
- LOG_LEVEL=debug # Noisy, but required for debugging
|
- LOG_LEVEL=debug # Noisy, but required for debugging
|
||||||
|
|
|
@ -7,7 +7,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- PUID={{ docker_user.id }}
|
- PUID={{ docker_user.id }}
|
||||||
- PGID={{ docker_user.id }}
|
- PGID={{ docker_user.id }}
|
||||||
- TZ={{ TZ }}
|
- TZ={{ timezone }}
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
labels:
|
labels:
|
||||||
|
|
|
@ -4,10 +4,10 @@ set -e
|
||||||
|
|
||||||
PATH=${PWD}/env/bin:${PATH}
|
PATH=${PWD}/env/bin:${PATH}
|
||||||
|
|
||||||
set -x
|
yamllint -sc ansible/yamllint.yml ansible
|
||||||
|
|
||||||
yamllint -sc ansible/yamllint.yml ansible/
|
cd ansible/
|
||||||
|
|
||||||
ansible-lint ansible/main.yml -p -c ansible/.ansible-lint
|
ansible-lint -p
|
||||||
|
|
||||||
cd ansible/ && ansible-playbook main.yml --syntax-check
|
ansible-playbook main.yml --syntax-check
|
||||||
|
|
Loading…
Reference in a new issue