This commit is contained in:
Christoph 2021-03-16 11:03:31 +01:00
parent 73afd0a8cf
commit 843912d125
5 changed files with 112 additions and 22 deletions

View File

@ -190,6 +190,7 @@ apt_initial_install_stretch:
- quotatool
- needrestart
- socat
- zsh
apt_initial_install_buster:
- apt-transport-https
@ -302,6 +303,7 @@ apt_initial_install_buster:
- quotatool
- needrestart
- socat
- zsh
apt_initial_install_xenial:
@ -1155,6 +1157,17 @@ git_sympa_repositories:
dest: /usr/local/src/sympa
# ---
# group [jitsi_meet_server]
# ---
git_jitsi_meet_repositories:
# install repositories (destination: /usr/local/src/)
- name: sympa
repo: https://git.oopen.de/install/jitsi
dest: /usr/local/src/jitsi
# ---
# Use this for host specific repositories defined in files git-<hostname>.yaml
#

View File

@ -52,8 +52,6 @@ root_ssh_keypair:
default_user:
- name: chris
user_id: 1000
group_id: 1000
password: $6$bSHlaLHC$URSMVq090e/cJ1v55Jh9ws0w5WekhO7X3Y0RqryAl5R76K9khWBegC76Smjastja.xMiD57/LzUUXW7y9NvAL.
shell: /bin/bash
ssh_keys:
@ -61,8 +59,6 @@ default_user:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCyWbdnjnN/xfy1F6kPbsRXp8zvJEh8uHfTZuZKyaRV/iRuhsvqRiDB+AhUAlIaPwgQ8itaI6t5hijD+sZf+2oXXbNy3hkOHTrCDKCoVAWfMRKPuA1m8RqS4ZXXgayaeCzVnPEq6UrC5z0wO/XBwAktT37RRSQ/Hq2zCHy36NQEQYrhF3+ytX7ayb10pJAMVGRctYmr5YnLEVMSIREbPxZTNc80H1zqNPVJwYZhl8Ox61U4MoNhJmJwbKWPRPZsJpbTh9W2EU37tdwRBVQP6yxhua3TR6C7JnNPVY0IK23BYlNtQEDY4PHcIuewkamEWpP0+jhEjtwy1TqjRPdU/y+2uQjC6FSOVMsSPxgd8mw4cSsfp+Ard7P+YOevUXD81+jFZ3Wz0PRXbWMWAm2OCe7n8jVvkXMz+KxSYtrsvKNw1WugJq1z//bJNMTK6ISWpqaXDevGYQRJJ8dPbMmbey40WpS5CA/l29P7fj/cOl59w3LZGshrMOm7lVz9qysVV0ylfE3OpfKCGitkpY0Asw4lSkuLHoNZnDo6I5/ulRuKi6gsLk27LO5LYS8Zm1VOis/qHk1Gg1+QY47C4RzdTUxlU1CGesPIiQ1uUX2Z4bD7ebTrrOuEFcmNs3Wu5nif21Qq0ELEWhWby6ChFrbFHPn+hWlDwNM0Nr11ftwg0+sqVw== root@luna'
- name: axel
user_id: 1001
group_id: 1001
password: $6$zUWC465e$XblctxwnBIOa7mPcN6foEQrwChjpwoY7lLtacXJrSsvjZS3I6Ox1mYUtN3/gzkvpbzOPx/9PlRJV.mbl939mD.
shell: /bin/bash
ssh_keys:

64
hosts
View File

@ -6,6 +6,8 @@ a.ns.oopen.de
[extra_hosts]
gitea.so36.net
devel-root.wf.netz
gw-123.oopen.de
@ -70,6 +72,9 @@ server25.warenform.de
web1.warenform.de
web0.warenform.de
# Jitsi Meet - Faire Integration
server28.warenform.de
o13.oopen.de
o13-board.oopen.de
o13-mail.oopen.de
@ -241,6 +246,9 @@ server27.warenform.de
verdi-django.warenform.de
verdi-es.warenform.de
# Jitsi Meet - Faire Integration
server28.warenform.de
# VServer Sinma
dns1.warenform.de
@ -390,6 +398,13 @@ devel-todo.wf.netz
devel-wiki.wf.netz
# ---
# so36.NET
# ---
gitea.so36.net
[apache2_webserver]
# ---
@ -541,6 +556,9 @@ devel-repos.wf.netz
[nginx_webserver]
# Jitsi Meet - Faire Integration
server28.warenform.de
# o12.oopen.de
stolpersteine.oopen.de
@ -987,6 +1005,32 @@ nscache.oopen.de
[xmpp_server]
[jitsi_meet_server]
# o17.oopen.de
meet2.oopen.de
# o23.oopen.de
meet.oopen.de
# o25.oopen.de
meet.faire-mobilitaet.de
# netcup - Jitsi Meet Martin Beck
o27.oopen.de
# Jitsi Meet - Anwaeltinnenbüro
o29.oopen.de
# Jitsi Meet - AG Beratung
o34.oopen.de
# Jitsi Meet - ReachOut
o36.oopen.de
# Jitsi Meet - Faire Integration
server28.warenform.de
[lxc_host]
@ -1187,6 +1231,9 @@ git.warenform.de
verdi-django.warenform.de
verdi-es.warenform.de
# Jitsi Meet - Faire Integration
server28.warenform.de
# - Vserver von Sinma
dns1.warenform.de
@ -1206,6 +1253,13 @@ devel-todo.wf.netz
devel-wiki.wf.netz
# ---
# so36.NET
# ---
gitea.so36.net
# All oopen server (except office networks)
[oopen_server]
@ -1324,6 +1378,13 @@ o37.oopen.de
a.ns.oopen.de
# ---
# so36.NET
# ---
gitea.so36.net
[oopen_office]
@ -1440,6 +1501,9 @@ server27.warenform.de
verdi-django.warenform.de
verdi-es.warenform.de
# Jitsi Meet - Faire Integration
server28.warenform.de
# - Vserver von Sinma
dns1.warenform.de

View File

@ -295,6 +295,22 @@
- git-sympa-repositories
# ---
# Group [jitsi_meet_server] reposotories
# ---
- name: (git.yml) Install/Update sympa server repositories
git:
repo: '{{ item.repo }}'
dest: '{{ item.dest }}'
with_items: '{{ git_jitsi_meet_repositories }}'
loop_control:
label: "{{ item.name }}"
when: "groups['jitsi_meet_server']|string is search(inventory_hostname)"
tags:
- git-jitsi_meet-repositories
# ---
# Other (host specific) repositories
# ---

View File

@ -95,24 +95,6 @@
tags:
- authorized_key
# ---
# - extra system user
# ---
- name: (users.yml) extra system user exists?
user:
name: '{{ item.name }}'
state: present
system: yes
home: '{{ item.home }}'
shell: '{{ item.shell|d("/usr/sbin/nologin") }}'
loop: "{{ extra_system_user }}"
loop_control:
label: '{{ item.name }}'
when: extra_system_user is defined and extra_system_user|length > 0
tags:
- user-exists
# ---
# - extra system groups
# ---
@ -127,6 +109,25 @@
tags:
- groups-exists
# ---
# - extra system user
# ---
- name: (users.yml) extra system user exists?
user:
name: '{{ item.name }}'
state: present
system: yes
home: '{{ item.home }}'
shell: '{{ item.shell|d("/usr/sbin/nologin") }}'
groups: '{{ item.groups | default(omit) }}'
loop: "{{ extra_system_user }}"
loop_control:
label: '{{ item.name }}'
when: extra_system_user is defined and extra_system_user|length > 0
tags:
- user-exists
# ---
# - Take care backup host has rsa key to connect via ssh to the other hosts