Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ansible-lint fixes #266

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .ansible-lint-ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This file contains ignores rule violations for ansible-lint
playbooks/send-erste-mail.yml jinja[spacing]
playbooks/send-erste-mail.yml name[play]
playbooks/send-erste-mail.yml yaml[comments]
playbooks/setup-proxmox.yml args[module]
playbooks/setup-proxmox.yml fqcn[action-core]
playbooks/setup-proxmox.yml name[play]
playbooks/setup-proxmox.yml yaml[octal-values]
playbooks/setup-quartiere.yml name[casing]
playbooks/setup-quartiere.yml name[play]
playbooks/setup-ssh.yml name[play]
playbooks/setup-tasmota.yml fqcn[action-core]
playbooks/setup-tasmota.yml name[play]
playbooks/setup-tools-old.yml name[casing]
playbooks/setup-tools-old.yml name[play]
playbooks/setup-xrdp.yml name[play]
playbooks/update-os.yml fqcn[action-core]
playbooks/update-os.yml name[play]
roles/borg_server/defaults/main.yml var-naming[no-role-prefix]
roles/borg_server/tasks/setup_client.yml var-naming[no-role-prefix]
roles/docker_compose_project/defaults/main.yml var-naming[no-role-prefix]
roles/haproxy_docker/defaults/main.yml var-naming[no-role-prefix]
roles/haproxy_lb/defaults/main.yml var-naming[no-role-prefix]
roles/hcloud_server/defaults/main.yml var-naming[no-role-prefix]
roles/links_on_desktop/vars/main.yml var-naming[no-role-prefix]
roles/quartierefuermenschen/defaults/main.yml var-naming[no-role-prefix]
roles/ssh_keys/defaults/main.yml var-naming[no-role-prefix]
roles/ucs_dns/defaults/main.yml var-naming[no-role-prefix]
10 changes: 6 additions & 4 deletions .github/workflows/mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
# More info at https://megalinter.io
name: MegaLinter

# Trigger mega-linter at every push. Action will also be visible from Pull
# Requests to main
on:
# Trigger mega-linter at every push. Action will also be visible from Pull Requests to main
push: # Comment this line to trigger action only on pull-requests (not recommended if you don't pay for GH Actions)
pull_request:
branches: [master, main]

env: # Comment env block if you do not want to apply fixes
# Comment env block if you do not want to apply fixes
env:
# Apply linter fixes configuration
APPLY_FIXES: all # When active, APPLY_FIXES must also be defined as environment variable (in github/workflows/mega-linter.yml or other CI tool)
APPLY_FIXES_EVENT: pull_request # Decide which event triggers application of fixes in a commit or a PR (pull_request, push, all)
Expand All @@ -26,7 +28,7 @@ jobs:
steps:
# Git Checkout
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
fetch-depth: 0 # If you use VALIDATE_ALL_CODEBASE = true, you can remove this line to improve performances
Expand All @@ -36,7 +38,7 @@ jobs:
id: ml
# You can override MegaLinter flavor used to have faster performances
# More info at https://megalinter.io/flavors/
uses: oxsecurity/megalinter@v6
uses: oxsecurity/megalinter@v8
env:
# All available variables are described in documentation
# https://megalinter.io/configuration/
Expand Down
2 changes: 1 addition & 1 deletion group_vars/tools_2023/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ docker_compose_project_api:
image: php:8.3-apache
restart: unless-stopped
ports:
- "{{ adfc_internal_ip}}:3500:80"
- "{{ adfc_internal_ip }}:3500:80"
volumes:
- api_data:/var/www/html:rw
labels:
Expand Down
12 changes: 6 additions & 6 deletions group_vars/tools_2023/chat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ docker_compose_project_rocketchat_test:
expose:
- 3005
ports:
- "{{ adfc_internal_ip}}:3005:3005"
- "{{ adfc_internal_ip }}:3005:3005"
mongodb:
image: docker.io/bitnami/mongodb:{{ rocketchat_test_mongodb_version }}
restart: unless-stopped
Expand All @@ -59,7 +59,7 @@ docker_compose_project_rocketchat_test:
MONGODB_INITIAL_PRIMARY_PORT_NUMBER: 27017
MONGODB_ADVERTISED_HOSTNAME: mongodb
MONGODB_ENABLE_JOURNAL: true
ALLOW_EMPTY_PASSWORD: yes
ALLOW_EMPTY_PASSWORD: yes # noqa yaml[truthy]

docker_compose_project_rocket:
nodes:
Expand Down Expand Up @@ -106,9 +106,9 @@ docker_compose_project_rocket:
expose:
- 3000
ports:
- "{{ adfc_internal_ip}}:3000:3000"
- "{{ adfc_internal_ip }}:3000:3000"
volumes:
- rocket_uploads:/app/uploads
- rocket_uploads:/app/uploads
mongodb:
image: docker.io/bitnami/mongodb:{{ rocketchat_live_mongodb_version }}
restart: unless-stopped
Expand All @@ -122,11 +122,11 @@ docker_compose_project_rocket:
MONGODB_INITIAL_PRIMARY_PORT_NUMBER: 27017
MONGODB_ADVERTISED_HOSTNAME: mongodb
MONGODB_ENABLE_JOURNAL: true
ALLOW_EMPTY_PASSWORD: yes
ALLOW_EMPTY_PASSWORD: yes # noqa yaml[truthy]
# Wenn man von außen zugreifen will:
# ports:
# - 127.0.0.1:27017:27017
deploy:
resources:
limits:
cpus: '1.8'
cpus: "1.8"
2 changes: 1 addition & 1 deletion group_vars/tools_2023/quartiere.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ docker_compose_project_quartiere:
secrets:
- db_password
ports:
- "{{ adfc_internal_ip}}:3400:80"
- "{{ adfc_internal_ip }}:3400:80"
secrets:
db_password:
file: db_password.txt
Expand Down
3 changes: 1 addition & 2 deletions group_vars/tools_2023/radverkehr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ docker_compose_project_radverkehr:
radverkehr:
image: nginx:mainline-alpine-slim
restart: unless-stopped
#environment:
ports:
- "{{ adfc_internal_ip}}:3800:80"
- "{{ adfc_internal_ip }}:3800:80"
volumes:
- radverkehr:/usr/share/nginx/html:ro
labels:
Expand Down
4 changes: 2 additions & 2 deletions group_vars/tools_2023/tour2pdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ docker_compose_project_tour2pdf:
tour2pdf:
restart: unless-stopped
image: ghcr.io/adfc-hamburg/tour2pdf
#environment:
# environment:
ports:
- "{{ adfc_internal_ip}}:4000:8000"
- "{{ adfc_internal_ip }}:4000:8000"
labels:
- "com.centurylinklabs.watchtower.scope=tour2pdf"
watchtower:
Expand Down
2 changes: 1 addition & 1 deletion group_vars/tools_2023/tresor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ docker_compose_project_tresor:
SIGNUPS_ALLOWED: false
IP_HEADER: x-client-ip
ports:
- "{{ adfc_internal_ip}}:3900:80"
- "{{ adfc_internal_ip }}:3900:80"
labels:
- "com.centurylinklabs.watchtower.scope=tresor"
secrets:
Expand Down
3 changes: 1 addition & 2 deletions group_vars/tools_2023/web20,.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ docker_compose_project_web20:
web20:
restart: unless-stopped
image: php:8.2-apache
#environment:
ports:
- "{{ adfc_internal_ip}}:3700:80"
- "{{ adfc_internal_ip }}:3700:80"
volumes:
- web20:/var/www/html
labels:
Expand Down
3 changes: 1 addition & 2 deletions group_vars/tools_2023/wiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ docker_compose_project_wiki:
wiki:
restart: unless-stopped
image: php:7.4-apache
#environment:
ports:
- "{{ adfc_internal_ip}}:3600:80"
- "{{ adfc_internal_ip }}:3600:80"
volumes:
- wiki:/var/www/html
labels:
Expand Down
13 changes: 0 additions & 13 deletions host_vars/chat.hamburg.adfc.de.yml

This file was deleted.

17 changes: 0 additions & 17 deletions host_vars/chat2.hamburg.adfc.de.yml

This file was deleted.

2 changes: 1 addition & 1 deletion host_vars/dreicx.gst.hamburg.adfc.de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ haproxy_ssl_sites:
extra_srv_opt: ssl-min-ver TLSv1.1 force-tlsv12

zabbix_version: "5.2"
zabbix_agent2: True
zabbix_agent2: true
zabbix_agent_server: 127.0.0.1,192.168.123.32
zabbix_agent_serveractive: 127.0.0.1,192.168.123.32
zabbix_api_use: false
Expand Down
157 changes: 0 additions & 157 deletions host_vars/proxmox01.adfc-intern.de.yml

This file was deleted.

14 changes: 0 additions & 14 deletions host_vars/proxmox01.gst.hamburg.adfc.de.yml

This file was deleted.

Loading
Loading