update..

2021-04-18 13:56:36 +02:00
parent 2339cdd6e8
commit d22a65ad9a
74 changed files with 4289 additions and 537 deletions
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@ -680,6 +680,12 @@ insert_ssh_keypair_backup_server: false

 ssh_keypair_backup_server: []

+
+insert_keypair_backup_client: false
+
+ssh_keypair_backup_client: []
+
+
 insert_root_ssh_keypair: false

 root_ssh_keypair: []
@ -692,6 +698,12 @@ sudo_users: []

 extra_system_user: []

+
+entries_authorized_key: []
+#entries_authorized_key:
+#  - user: root
+#  - key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDcc4brtgGW0xP2KiZGq5xsyUKcNiYF72zQ49Z0lqx3iu0zj9oz79oGZY1N9jCeKG30AsbwL+4H6/l2hAekFZu6fIwuiRgCVRAwYrnnlOGDAnYOGHfks23pk2BU0/fb2VnxiK967FvpJ/xDP49t1UC5voX/O2MTkz6NROJPwIClHgnwN1bg+C09UpJNmmdROi8myhiu1/aYbAWDfQzVUnHio0q3vBM16ZUQkoIHxQT4fF8elS408n0jd9WJHyRtLB/mCMI6O3G2yHdPVciqKwgRwRtJ8hDjmFfyeLtxb4ADpa2Q/f6MuJI0elxbxjp8l2XKjVSwPJ8GKomC16HfgFMrnUNQcx9YMrXB26f+lperf9NlwbQtXZffj9M+BxTAFvh+1Q/iIHqRat2Bb/8OUY9JI2zuWUliffqb5Kbzjik4vMqZvI2ED2zphsPcpLST7u+4z40vZliBf1F4P2vDBfIRK87ldfJQQw6saMZznjZPNV7CA+K7IFCpOz0wuoVE3wOka8hdYmMIMno34Zf6P+xuTaAPXJOCubKuhicUlhtX7q72Pln5kuvbO3ZRgEK3XnyIWeAd2rkaU6XVo7W19043e9HkkbG8nZETYu7TGFhufXyloinde5XLyW295BS8fKa1AteJPDLY4ClF2PZiWbxWRjAhlRAlgXgup09rN2HHjw== root@b.ns'
+
 create_sftp_group: false


@ -1176,6 +1188,126 @@ git_jitsi_meet_repositories:
 git_other_repositories: []


+# ---
+# vars used by roles/common/tasks/copy_files.yml
+# ---
+
+copy_plain_files: []
+
+copy_template_files: []
+
+
+# ---
+# vars used by roles/common/tasks/symlink_files.yml
+# ---
+
+symlink_files: []
+
+
+# ---
+# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
+# ---
+
+hostname:
+ipv4_address:
+ipv6_address:
+
+# postfix_db_type
+#
+# possible values are 'PostgreSQL' and 'MySQL'
+postfix_db_type:
+postfix_db_name:
+postfix_db_user:
+postfix_db_host:
+postfix_db_pass:
+
+# -
+# install_amavis.conf
+# -
+
+# mp_receipt_number
+#
+# O.OPEN/IL/Warenform: 106015125438
+#
+mp_receipt_number:
+
+# si_authorisation_signature
+#
+# O.OPEN/IL: b0b7e94d3fcc8f3b1f128edd5830392361868cf0174723a9924ac25bf8b1b588cb974b50234e1bc1d9839dfe0ca6e1627733d90daf1399347b1046d20c2e3a89
+#
+# Warenform: 76ed7ca6670dbee497e1a0397a7e178c4caa25888bc26d7327d1eab0195342a4cfa522dcf10382623d57dbc2a79bd37627b9a52def4d4bfe617d26e35405ce3b
+#
+si_authorisation_signature:
+
+# -
+# install_postfixadmin.conf
+# -
+
+website_name_postfixadmin:
+
+#email_welcome_message: "\n
+#Hallo,\n
+#
+#Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n
+#
+#O.OPEN\n
+#
+#--\n
+#O.OPEN            |   Phone:  +49 30 / 290 484 91\n
+#Erkelenzdamm 21   |   Fax:    +49 30 / 290 484 99\n
+#D-10999 Berlin    |   E-MAIL: oo@oopen.de\n
+#"
+email_welcome_message:
+
+# -
+# install_update_dovecot.conf
+# -
+
+dovecot_from_address:
+dovecot_reply_to:
+webmailer_address:
+
+#salutation: "O.OPEN\n
+#
+#--\n
+#O.OPEN           |   Phone:  +49 30 / 290 484 91\n
+#Erkelenzdamm 21  |   Fax:    +49 30 / 290 484 99\n
+#D-10999 Berlin   |   http://oopen.de"
+salutation:
+
+# -
+# install_upgrade_roundcube-webmail.conf
+# -
+
+# First Webmailer
+webmail_site_name:
+autoreply_hostname:
+# possible values: 'pgsql' or 'mysql'
+roundcube_db_type:
+roundcube_db_name:
+roundcube_db_user:
+roundcube_db_host:
+roundcube_db_pass:
+
+roundcube_product_name:
+roundcube_support_url:
+roundcube_skin_logo:
+
+# 2 Webmailer
+webmaili_2_site_name:
+autoreply_2_hostname:
+# possible values: 'pgsql' or 'mysql'
+roundcube_2_db_type:
+roundcube_2_db_name:
+roundcube_2_db_user:
+roundcube_2_db_host:
+roundcube_2_db_pass:
+
+roundcube_2_product_name:
+roundcube_2_support_url:
+roundcube_2_skin_logo:
+
+
 # ==============================


--- a/group_vars/gateway_server.yml
+++ b/group_vars/gateway_server.yml
@ -28,6 +28,8 @@
 # ---
 # vars used by roles/common/tasks/users.yml
 # ---
+
+insert_ssh_keypair_backup_server: false
 ssh_keypair_backup_server:
  - name: backup
    backup_user: back
@ -36,18 +38,15 @@ ssh_keypair_backup_server:
    pub_key_src: root/.ssh/id_rsa.backup.oopen.de.pub
    pub_key_dest: /root/.ssh/id_rsa.pub

-insert_root_ssh_keypair: true
-
-root_ssh_keypair:
+insert_keypair_backup_client: true
+ssh_keypair_backup_client:
  - name: backup
-    login: root
    priv_key_src: root/.ssh/id_ed25519.oopen-server
    priv_key_dest: /root/.ssh/id_ed25519
    pub_key_src: root/.ssh/id_ed25519.oopen-server.pub
    pub_key_dest: /root/.ssh/id_ed25519.pub
    target: backup.oopen.de

-
 default_user:

  - name: chris
--- a/group_vars/oopen_office_ga.yml
+++ b/group_vars/oopen_office_ga.yml
@ -28,6 +28,8 @@
 # ---
 # vars used by roles/common/tasks/users.yml
 # ---
+
+insert_ssh_keypair_backup_server: false
 ssh_keypair_backup_server:
  - name: backup
    backup_user: back
@ -36,11 +38,9 @@ ssh_keypair_backup_server:
    pub_key_src: root/.ssh/id_rsa.backup.oopen.de.pub
    pub_key_dest: /root/.ssh/id_rsa.pub

-insert_root_ssh_keypair: true
-
-root_ssh_keypair:
+insert_keypair_backup_client: true
+ssh_keypair_backup_client:
  - name: backup
-    login: root
    priv_key_src: root/.ssh/id_ed25519.oopen-server
    priv_key_dest: /root/.ssh/id_ed25519
    pub_key_src: root/.ssh/id_ed25519.oopen-server.pub
--- a/group_vars/oopen_server.yml
+++ b/group_vars/oopen_server.yml
@ -28,6 +28,8 @@
 # ---
 # vars used by roles/common/tasks/users.yml
 # ---
+
+insert_ssh_keypair_backup_server: false
 ssh_keypair_backup_server:
  - name: backup
    backup_user: back
@ -36,11 +38,9 @@ ssh_keypair_backup_server:
    pub_key_src: root/.ssh/id_rsa.backup.oopen.de.pub
    pub_key_dest: /root/.ssh/id_rsa.pub

-insert_root_ssh_keypair: true
-
-root_ssh_keypair:
+insert_keypair_backup_client: true
+ssh_keypair_backup_client:
  - name: backup
-    login: root
    priv_key_src: root/.ssh/id_ed25519.oopen-server
    priv_key_dest: /root/.ssh/id_ed25519
    pub_key_src: root/.ssh/id_ed25519.oopen-server.pub
--- a/group_vars/warenform_office.yml
+++ b/group_vars/warenform_office.yml
@ -37,9 +37,8 @@ ssh_keypair_backup_server:
    pub_key_src: root/.ssh/id_rsa.devel-root.pub
    pub_key_dest: /root/.ssh/id_rsa.pub

-insert_root_ssh_keypair: true
-
-root_ssh_keypair:
+insert_keypair_backup_client: true
+ssh_keypair_backup_client:
  - name: backup
    priv_key_src: root/.ssh/id_ed25519.warenform-office
    priv_key_dest: /root/.ssh/id_ed25519
--- a/group_vars/warenform_server.yml
+++ b/group_vars/warenform_server.yml
@ -29,6 +29,7 @@
 # vars used by roles/common/tasks/users.yml
 # ---

+insert_ssh_keypair_backup_server: false
 ssh_keypair_backup_server:
  - name: backup
    backup_user: back
@ -37,11 +38,9 @@ ssh_keypair_backup_server:
    pub_key_src: root/.ssh/id_rsa.backup.warenform.de.pub
    pub_key_dest: /root/.ssh/id_rsa.pub

-insert_root_ssh_keypair: true
-
-root_ssh_keypair:
+insert_keypair_backup_client: true
+ssh_keypair_backup_client:
  - name: backup
-    login: root
    priv_key_src: root/.ssh/id_ed25519.warenform-server
    priv_key_dest: /root/.ssh/id_ed25519
    pub_key_src: root/.ssh/id_ed25519.warenform-server.pub