Merge branch 'master' of ssh://gitea.mewissen.site:22422/rene/ansible-pull

This commit is contained in:
2025-04-28 18:04:50 +02:00
5 changed files with 35 additions and 12 deletions

7
hosts
View File

@@ -60,7 +60,6 @@ freeradius.universe.local
backup.universe.local backup.universe.local
[database] [database]
coruscant.universe.local
mariadb01.universe.local mariadb01.universe.local
mariadb02.universe.local mariadb02.universe.local
mariadb03.universe.local mariadb03.universe.local
@@ -71,7 +70,6 @@ endorvm.universe.local
tuxedo-book-xp1511.universe.local tuxedo-book-xp1511.universe.local
[dhcpserver] [dhcpserver]
coruscant.universe.local
dhcp-kea.universe.local dhcp-kea.universe.local
[docker] [docker]
@@ -91,7 +89,6 @@ samba-ad-dc2
drone.universe.local drone.universe.local
[fileserver] [fileserver]
coruscant.universe.local
nfs-server.universe.local nfs-server.universe.local
[glustertest] [glustertest]
@@ -112,7 +109,6 @@ icinga_satellite
mewimeet.de jitsi_fqdn=mewimeet.de mewimeet.de jitsi_fqdn=mewimeet.de
[mailserver] [mailserver]
coruscant.universe.local
mail.mewissen.site mail.mewissen.site
mailcow.universe.local mailcow.universe.local
mail.universe.local mail.universe.local
@@ -127,7 +123,6 @@ lifebook-u939.universe.local
LIFEBOOK-U939 LIFEBOOK-U939
[nameserver] [nameserver]
coruscant.universe.local
dnspri.universe.local dnspri.universe.local
dnssec1.universe.local dnssec1.universe.local
dnssec2.universe.local dnssec2.universe.local
@@ -143,10 +138,8 @@ endorvm.universe.local
tuxedo-book-xp1511.universe.local tuxedo-book-xp1511.universe.local
[printspooler] [printspooler]
coruscant.universe.local
[proxyserver] [proxyserver]
coruscant.universe.local
tinyproxy.universe.local tinyproxy.universe.local
[video_editing] [video_editing]

View File

@@ -76,4 +76,18 @@
- dnsutils - dnsutils
- unattended-upgrades - unattended-upgrades
- "{{ python_passlib_package }}" - "{{ python_passlib_package }}"
when: ansible_distribution in [ "Debian", "Ubuntu", "Linux Mint" ] when: ansible_distribution in [ "Debian", "Ubuntu" ]
- name: system setup | utilities | install utilities (linux mint)
tags: packages,system,system setup
package:
state: latest
name:
- bat
- sudo
- htop
- eza
- dnsutils
- unattended-upgrades
- "{{ python_passlib_package }}"
when: ansible_distribution in [ "Linux Mint" ]

View File

@@ -13,7 +13,7 @@
enabled: true enabled: true
when: ansible_distribution == "Archlinux" when: ansible_distribution == "Archlinux"
- name: "add cronjob for ansible" - name: add cronjob for ansible
become: true become: true
become_user: root become_user: root
cron: cron:
@@ -24,6 +24,23 @@
minute: 0 minute: 0
hour: 1 hour: 1
- name: correct crontab for reboot | remove
become: true
become_user: root
cron:
name: "generate SSH key on reboot, if missing"
job: '[[ -f /etc/ssh/ssh_host_* ]] | ssh-keygen -A'
state: absent
- name: correct crontab for reboot | add
become: true
become_user: root
cron:
name: "generate SSH key on reboot, if missing"
job: '[[ -f /etc/ssh/ssh_host_* ]] || ssh-keygen -A'
state: present
special_time: reboot
# - name: system setup | cron | schedule automatic ansible provisioning # - name: system setup | cron | schedule automatic ansible provisioning
# tags: cron # tags: cron
# cron: # cron:
@@ -59,4 +76,4 @@
hour: "0" hour: "0"
minute: "0" minute: "0"
job: "{{ root_home }} + '/bin/cron_pacman'" job: "{{ root_home }} + '/bin/cron_pacman'"
when: ansible_distribution in ["Archlinux"] when: ansible_distribution in ["Archlinux"]

View File

@@ -6,7 +6,6 @@
owner: 'root' owner: 'root'
group: 'root' group: 'root'
loop: loop:
- { ip: '192.168.1.240', fqdn: 'coruscant.universe.local'}
- { ip: '192.168.1.238', fqdn: 'gitea.mewissen.site'} - { ip: '192.168.1.238', fqdn: 'gitea.mewissen.site'}
when: when:
- set_hosts is defined - set_hosts is defined

View File

@@ -21,7 +21,7 @@
- {key: "maillog_file", value: "/var/log/postfix.log"} - {key: "maillog_file", value: "/var/log/postfix.log"}
- {key: "message_size_limit", value: "0"} - {key: "message_size_limit", value: "0"}
- {key: "milter_default_action", value: "accept"} - {key: "milter_default_action", value: "accept"}
- {key: "mydestination", value: "'localhost, kashyyyk, coruscant, $myhostname'"} - {key: "mydestination", value: "'localhost, kashyyyk, $myhostname'"}
- {key: "myhostname", value: "{{ hostname | default(ansible_hostname) }}"} - {key: "myhostname", value: "{{ hostname | default(ansible_hostname) }}"}
- {key: "mynetworks", value: "'{{ mynetworks }}'"} - {key: "mynetworks", value: "'{{ mynetworks }}'"}
- {key: "mynetworks_style", value: "subnet"} - {key: "mynetworks_style", value: "subnet"}