diff --git a/backup.yaml b/backup.yaml index 0147b79..c8aad58 100644 --- a/backup.yaml +++ b/backup.yaml @@ -6,3 +6,4 @@ - common - internalsmtp - backupscript +... diff --git a/dbhosts.yaml b/dbhosts.yaml index 923486d..330b75b 100644 --- a/dbhosts.yaml +++ b/dbhosts.yaml @@ -7,3 +7,4 @@ - customfirewall - backupscript - customfirewall +... diff --git a/drone-runner.yaml b/drone-runner.yaml index d67f70f..fd08b95 100644 --- a/drone-runner.yaml +++ b/drone-runner.yaml @@ -6,3 +6,4 @@ - common - docker - internalsmtp +... diff --git a/gitea.yaml b/gitea.yaml index f80bfc5..3eb23af 100644 --- a/gitea.yaml +++ b/gitea.yaml @@ -9,3 +9,4 @@ - internalsmtp - backupscript - customfirewall +... diff --git a/group_vars/mckay.yaml b/group_vars/mckay.yaml index 71861a0..ff6c20b 100644 --- a/group_vars/mckay.yaml +++ b/group_vars/mckay.yaml @@ -1,3 +1,4 @@ --- netplan: default_gateway: "192.168.69.254" +... diff --git a/group_vars/woolsey.yaml b/group_vars/woolsey.yaml index a0ce937..603239b 100644 --- a/group_vars/woolsey.yaml +++ b/group_vars/woolsey.yaml @@ -1,3 +1,4 @@ --- netplan: default_gateway: "192.168.69.1" +... diff --git a/host_vars/backup.yaml b/host_vars/backup.yaml index 4ffa73d..9447b03 100644 --- a/host_vars/backup.yaml +++ b/host_vars/backup.yaml @@ -3,3 +3,4 @@ servicename: mckay backup: host: oniel.tormakristof.eu internal: false +... diff --git a/host_vars/git.yaml b/host_vars/git.yaml index ed7e991..9d64cd2 100644 --- a/host_vars/git.yaml +++ b/host_vars/git.yaml @@ -7,3 +7,4 @@ firewall: - port: "2222" proto: tcp interface: "eth0" +... diff --git a/host_vars/mariadb.yaml b/host_vars/mariadb.yaml index 9f97dd4..60c89cf 100644 --- a/host_vars/mariadb.yaml +++ b/host_vars/mariadb.yaml @@ -3,3 +3,4 @@ firewall: - port: "3306" proto: tcp interface: "eth0" +... diff --git a/host_vars/neko.yaml b/host_vars/neko.yaml index 2fe1a9d..7562fbc 100644 --- a/host_vars/neko.yaml +++ b/host_vars/neko.yaml @@ -22,3 +22,4 @@ netplan: dhcp4: true dhcp6: true denydns: true +... diff --git a/host_vars/nexus.yaml b/host_vars/nexus.yaml index bbf7f2a..38a3145 100644 --- a/host_vars/nexus.yaml +++ b/host_vars/nexus.yaml @@ -4,3 +4,4 @@ webserver: port: 8080 - domain: "registry.kmlabz.com" port: 4269 +... diff --git a/host_vars/openvpn.yaml b/host_vars/openvpn.yaml index d19dea1..5e45f21 100644 --- a/host_vars/openvpn.yaml +++ b/host_vars/openvpn.yaml @@ -20,3 +20,4 @@ netplan: dhcp4: true dhcp6: false denydns: true +... diff --git a/host_vars/postgres.yaml b/host_vars/postgres.yaml index ebb31ee..92dd5ab 100644 --- a/host_vars/postgres.yaml +++ b/host_vars/postgres.yaml @@ -3,3 +3,4 @@ firewall: - port: "5432" proto: tcp interface: "eth0" +... diff --git a/inventory.yaml b/inventory.yaml index baedee2..82fc928 100644 --- a/inventory.yaml +++ b/inventory.yaml @@ -42,3 +42,4 @@ all: ansible_host: mariadb.stargate.internal backup: ansible_host: backup.stargate.internal +... diff --git a/neko.yaml b/neko.yaml index 7bc3087..2d55757 100644 --- a/neko.yaml +++ b/neko.yaml @@ -7,3 +7,4 @@ - neko - customfirewall - internalsmtp +... diff --git a/requirements.yaml b/requirements.yaml index 6d6e45e..ce912d7 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -1,4 +1,5 @@ --- collections: - ansible.posix -- community.general \ No newline at end of file +- community.general +... diff --git a/roles/backupscript/defaults/main.yaml b/roles/backupscript/defaults/main.yaml index eacc86f..1892d07 100644 --- a/roles/backupscript/defaults/main.yaml +++ b/roles/backupscript/defaults/main.yaml @@ -4,3 +4,4 @@ backup: internal: true prearecommand: "" basedir: /mnt/backupstore +... diff --git a/roles/backupscript/tasks/main.yaml b/roles/backupscript/tasks/main.yaml index bbfd3d2..cc0741d 100644 --- a/roles/backupscript/tasks/main.yaml +++ b/roles/backupscript/tasks/main.yaml @@ -57,3 +57,4 @@ mode: 0600 owner: root group: root +... diff --git a/roles/common/defaults/main.yaml b/roles/common/defaults/main.yaml index 6199a3d..884c933 100644 --- a/roles/common/defaults/main.yaml +++ b/roles/common/defaults/main.yaml @@ -5,3 +5,4 @@ timedatectl_timeservers: ['noc-a.sch.bme.hu', 'noc-b.sch.bme.hu'] timedatectl_timeservers_fallback: ['time.bme.hu'] timedatectl_timezone: 'Europe/Budapest' +... diff --git a/roles/common/handlers/main.yaml b/roles/common/handlers/main.yaml index c90fb14..f0ed402 100644 --- a/roles/common/handlers/main.yaml +++ b/roles/common/handlers/main.yaml @@ -1,3 +1,4 @@ --- - name: run Timedatectl command: timedatectl set-ntp true +... diff --git a/roles/common/tasks/apt.yaml b/roles/common/tasks/apt.yaml index 39ae20b..2812329 100644 --- a/roles/common/tasks/apt.yaml +++ b/roles/common/tasks/apt.yaml @@ -35,3 +35,4 @@ - tcpdump - xxd - git +... diff --git a/roles/common/tasks/clean-motd.yaml b/roles/common/tasks/clean-motd.yaml index 1d6dad2..b8fd3b3 100644 --- a/roles/common/tasks/clean-motd.yaml +++ b/roles/common/tasks/clean-motd.yaml @@ -5,4 +5,5 @@ owner: tormakris group: tormakris mode: "0644" - path: /home/tormakris/.hushlogin \ No newline at end of file + path: /home/tormakris/.hushlogin +... diff --git a/roles/common/tasks/disable-cloudinit.yaml b/roles/common/tasks/disable-cloudinit.yaml index 028dd65..5b87ed4 100644 --- a/roles/common/tasks/disable-cloudinit.yaml +++ b/roles/common/tasks/disable-cloudinit.yaml @@ -10,4 +10,4 @@ content: "network: {config: disabled}" dest: /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg force: no - +... diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml index 8e8383c..97689c2 100644 --- a/roles/common/tasks/main.yaml +++ b/roles/common/tasks/main.yaml @@ -6,4 +6,5 @@ - include_tasks: ufw.yaml - include_tasks: user-ops.yaml - include_tasks: ssh-security-settings.yaml -- include_tasks: timesync.yaml \ No newline at end of file +- include_tasks: timesync.yaml +... diff --git a/roles/common/tasks/remove-snap.yaml b/roles/common/tasks/remove-snap.yaml index e088c05..3a9f163 100644 --- a/roles/common/tasks/remove-snap.yaml +++ b/roles/common/tasks/remove-snap.yaml @@ -15,4 +15,5 @@ - /var/snap - /var/lib/snapd - "/home/{{ ansible_user }}/snap" - when: ansible_distribution == "Ubuntu" \ No newline at end of file + when: ansible_distribution == "Ubuntu" +... diff --git a/roles/common/tasks/ssh-security-settings.yaml b/roles/common/tasks/ssh-security-settings.yaml index 4ff1ecd..81a7e18 100644 --- a/roles/common/tasks/ssh-security-settings.yaml +++ b/roles/common/tasks/ssh-security-settings.yaml @@ -38,3 +38,4 @@ path: /etc/ssh/sshd_config line: "AllowUsers tormakris ansible service-user" when: checkallowusers.found == 0 +... diff --git a/roles/common/tasks/timesync.yaml b/roles/common/tasks/timesync.yaml index 32ce27c..f6cd8c7 100644 --- a/roles/common/tasks/timesync.yaml +++ b/roles/common/tasks/timesync.yaml @@ -16,3 +16,4 @@ state: restarted daemon_reload: yes name: systemd-timesyncd +... diff --git a/roles/common/tasks/ufw.yaml b/roles/common/tasks/ufw.yaml index 8d963fd..b283862 100644 --- a/roles/common/tasks/ufw.yaml +++ b/roles/common/tasks/ufw.yaml @@ -18,3 +18,4 @@ community.general.ufw: rule: allow port: ssh +... diff --git a/roles/common/tasks/user-ops.yaml b/roles/common/tasks/user-ops.yaml index d739eb2..195d58e 100644 --- a/roles/common/tasks/user-ops.yaml +++ b/roles/common/tasks/user-ops.yaml @@ -10,3 +10,4 @@ user: tormakris state: present key: https://static.tormakristof.eu/ssh.keys +... diff --git a/roles/customfirewall/tasks/main.yaml b/roles/customfirewall/tasks/main.yaml index e21e52d..3a130d0 100644 --- a/roles/customfirewall/tasks/main.yaml +++ b/roles/customfirewall/tasks/main.yaml @@ -7,3 +7,4 @@ proto: "{{item.proto}}" interface: "{{item.interface}}" with_items: "{{ firewall }}" +... diff --git a/roles/docker/tasks/main.yaml b/roles/docker/tasks/main.yaml index 878e0c3..671fd99 100644 --- a/roles/docker/tasks/main.yaml +++ b/roles/docker/tasks/main.yaml @@ -26,3 +26,4 @@ comment: Service user groups: docker append: yes +... diff --git a/roles/internalsmtp/defaults/main.yaml b/roles/internalsmtp/defaults/main.yaml index b5bfcce..ed4f2c6 100644 --- a/roles/internalsmtp/defaults/main.yaml +++ b/roles/internalsmtp/defaults/main.yaml @@ -2,3 +2,4 @@ postfix_relayhost: 'smtp.stargate.internal' external_domain: 'tormakris.dev' +... diff --git a/roles/internalsmtp/tasks/main.yaml b/roles/internalsmtp/tasks/main.yaml index 10bdaea..7920f57 100644 --- a/roles/internalsmtp/tasks/main.yaml +++ b/roles/internalsmtp/tasks/main.yaml @@ -16,3 +16,4 @@ name: postfix state: restarted enabled: yes +... diff --git a/roles/neko/tasks/main.yaml b/roles/neko/tasks/main.yaml index 171c546..f56049e 100644 --- a/roles/neko/tasks/main.yaml +++ b/roles/neko/tasks/main.yaml @@ -26,3 +26,4 @@ - name: Enable ufw community.general.ufw: state: enabled +... diff --git a/roles/netplan/defaults/main.yaml b/roles/netplan/defaults/main.yaml index 61c37c3..dc08d05 100644 --- a/roles/netplan/defaults/main.yaml +++ b/roles/netplan/defaults/main.yaml @@ -1,3 +1,4 @@ --- netplan: additionalinterfaces: [] +... diff --git a/roles/netplan/handlers/main.yaml b/roles/netplan/handlers/main.yaml index 6e1c62f..3dd347b 100644 --- a/roles/netplan/handlers/main.yaml +++ b/roles/netplan/handlers/main.yaml @@ -2,4 +2,5 @@ - name: "netplanapply" command: netplan apply async: 45 - poll: 0 \ No newline at end of file + poll: 0 +... diff --git a/roles/netplan/tasks/main.yaml b/roles/netplan/tasks/main.yaml index 700f331..7fb07d8 100644 --- a/roles/netplan/tasks/main.yaml +++ b/roles/netplan/tasks/main.yaml @@ -14,3 +14,4 @@ src: templates/netplan.yaml dest: /etc/netplan/00-static.yaml notify: netplanapply +... diff --git a/roles/netplan/templates/netplan.yaml b/roles/netplan/templates/netplan.yaml index afc34d3..dd8ad5b 100644 --- a/roles/netplan/templates/netplan.yaml +++ b/roles/netplan/templates/netplan.yaml @@ -8,33 +8,34 @@ network: dhcp-identifier: mac dhcp4-overrides: use-routes: false - {%- if netplan.default_gateway is defined and netplan.default_gateway|length > 0 %} +{% if netplan.default_gateway is defined and netplan.default_gateway|length > 0 %} gateway4: {{netplan.default_gateway}} {% endif %} - {%- if netplan.additionalinterfaces is defined and netplan.additionalinterfaces|length > 0 %} - {%- for interface in netplan.additionalinterfaces %} +{% if netplan.additionalinterfaces is defined and netplan.additionalinterfaces|length > 0 %} +{% for interface in netplan.additionalinterfaces %} {{ interface.name }}: dhcp4: {{ interface.dhcp4 }} dhcp6: {{ interface.dhcp6 }} dhcp-identifier: mac dhcp4-overrides: use-routes: false - {%- if interface.addresses is defined and interface.addresses|length > 0 %} +{% if interface.addresses is defined and interface.addresses|length > 0 %} addresses: - {%- for address in interface.addresses %} +{% for address in interface.addresses %} - {{address}} {% endfor %} {% endif %} - {%- if interface.gateway4 is defined and interface.gateway4|length > 0 %} +{% if interface.gateway4 is defined and interface.gateway4|length > 0 %} gateway4: {{interface.gateway4}} {% endif %} - {%- if interface.gateway6 is defined and interface.gateway6|length > 0 %} +{% if interface.gateway6 is defined and interface.gateway6|length > 0 %} gateway4: {{interface.gateway6}} {% endif %} - {%- if interface.denydns %} +{% if interface.denydns %} nameservers: addresses: [] search: [] {% endif %} {% endfor %} {% endif %} +... diff --git a/roles/openvpn/tasks/main.yaml b/roles/openvpn/tasks/main.yaml index 7b8f48f..9ee9e2d 100644 --- a/roles/openvpn/tasks/main.yaml +++ b/roles/openvpn/tasks/main.yaml @@ -24,9 +24,4 @@ name: openvpn state: restarted enabled: yes - -- name: Allow openvpn port via ufw - community.general.ufw: - rule: allow - port: "1194" - proto: udp +... diff --git a/roles/smtpgateway/defaults/main.yaml b/roles/smtpgateway/defaults/main.yaml index d8ae5d3..7ac68cb 100644 --- a/roles/smtpgateway/defaults/main.yaml +++ b/roles/smtpgateway/defaults/main.yaml @@ -1,3 +1,4 @@ --- postfix_relayhost: 'smtp-relay.gmail.com' -external_domain: 'tormakris.dev' \ No newline at end of file +external_domain: 'tormakris.dev' +... diff --git a/roles/smtpgateway/tasks/main.yaml b/roles/smtpgateway/tasks/main.yaml index de58076..6f8ecdc 100644 --- a/roles/smtpgateway/tasks/main.yaml +++ b/roles/smtpgateway/tasks/main.yaml @@ -24,3 +24,4 @@ community.general.ufw: rule: allow port: smtp +... diff --git a/roles/webgateway/tasks/main.yaml b/roles/webgateway/tasks/main.yaml index d07a16d..8743b55 100644 --- a/roles/webgateway/tasks/main.yaml +++ b/roles/webgateway/tasks/main.yaml @@ -124,3 +124,4 @@ path: "{{ item.directory }}/.git" state: absent with_items: "{{ static }}" +... diff --git a/roles/webgateway/vars/main.yaml b/roles/webgateway/vars/main.yaml index 8cfd530..36abf6d 100644 --- a/roles/webgateway/vars/main.yaml +++ b/roles/webgateway/vars/main.yaml @@ -14,3 +14,4 @@ static: - {domain: tormakris.dev, directory: /var/www/tormakristof.eu, repo: "https://git.kmlabz.com/kmlabz/homepage.git"} - {domain: torma.xyz, directory: /var/www/tormakristof.eu, repo: "https://git.kmlabz.com/kmlabz/homepage.git"} - {domain: kmlabz.com, directory: /var/www/kmlabz.com, repo: "https://git.kmlabz.com/kmlabz/homepage.git"} +... diff --git a/roles/webserver/defaults/main.yaml b/roles/webserver/defaults/main.yaml index 4775742..4099df9 100644 --- a/roles/webserver/defaults/main.yaml +++ b/roles/webserver/defaults/main.yaml @@ -1,3 +1,4 @@ webserver: - domain: "_" port: 8080 +... diff --git a/roles/webserver/tasks/main.yaml b/roles/webserver/tasks/main.yaml index ef21678..7acc4f1 100644 --- a/roles/webserver/tasks/main.yaml +++ b/roles/webserver/tasks/main.yaml @@ -29,3 +29,4 @@ community.general.ufw: rule: allow port: https +... diff --git a/smtp.yaml b/smtp.yaml index 145956f..0be889c 100644 --- a/smtp.yaml +++ b/smtp.yaml @@ -5,3 +5,4 @@ - netplan - common - smtpgateway +... diff --git a/webgateway.yaml b/webgateway.yaml index 14e7054..653cf55 100644 --- a/webgateway.yaml +++ b/webgateway.yaml @@ -5,3 +5,4 @@ - common - webgateway - internalsmtp +...