From c69976780869110aed007fbd97b7e44d2b798df3 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sun, 12 Dec 2021 23:00:31 +0100 Subject: [PATCH] Update to 2021-12-12 23:00 --- roles/letsencrypt/tasks/main.yml | 2 +- roles/samba/defaults/main.yml | 6 +++--- roles/sssd_ad_auth/defaults/main.yml | 2 +- roles/unifi/defaults/main.yml | 4 ++-- roles/zabbix_agent/tasks/install_Debian.yml | 2 +- roles/zimbra/defaults/main.yml | 16 ++++++++-------- roles/zimbra/tasks/main.yml | 2 +- roles/zimbra/tasks/zmldapsync.yml | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/roles/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml index a287483..21e74e8 100644 --- a/roles/letsencrypt/tasks/main.yml +++ b/roles/letsencrypt/tasks/main.yml @@ -37,7 +37,7 @@ with_items: - url: https://raw.githubusercontent.com/dehydrated-io/dehydrated/master/dehydrated dest: /usr/local/bin/dehydrated - - url: https://git.fws.fr/fws/dehydrated/raw/branch/master/dehydrated_hooks + - url: https://git.lapiole.org/dani/dehydrated/raw/branch/master/dehydrated_hooks dest: /usr/local/bin/dehydrated_hooks when: ansible_os_family == 'Debian' tags: web,ssl diff --git a/roles/samba/defaults/main.yml b/roles/samba/defaults/main.yml index 42de201..9e269ac 100644 --- a/roles/samba/defaults/main.yml +++ b/roles/samba/defaults/main.yml @@ -9,8 +9,8 @@ samba_role: member # The following settings are only needed when role is dc or member # # Default samba domain will be your domain name without the TLD -# samba_domain: FWS -# samba_realm: ad.fws.fr +# samba_domain: EXAMPLE +# samba_realm: ad.example.org # Must be defined manually # samba_dc_admin_pass: @@ -83,7 +83,7 @@ samba_file_src_ip: [] samba_trusted_domains: {} # samba_trusted_domains: -# - name: ad.fws.fr +# - name: ad.other-domain.org # admin_user: administrator # admin_pass: s3cret diff --git a/roles/sssd_ad_auth/defaults/main.yml b/roles/sssd_ad_auth/defaults/main.yml index 5cd4a8f..fd072bc 100644 --- a/roles/sssd_ad_auth/defaults/main.yml +++ b/roles/sssd_ad_auth/defaults/main.yml @@ -23,7 +23,7 @@ ad_private_groups: True # sssd doesn't support cross forest approbations, but we can add the Linux box to the other domains ad_trusted_domains: "{{ samba_trusted_domains | default([]) }}" # ad_trusted_domains: -# - name: ad.fws.fr +# - name: ad.other-domain.org # admin_user: administrator # admin_pass: s3cr3t. diff --git a/roles/unifi/defaults/main.yml b/roles/unifi/defaults/main.yml index 5a45745..1d2a813 100644 --- a/roles/unifi/defaults/main.yml +++ b/roles/unifi/defaults/main.yml @@ -1,9 +1,9 @@ --- unifi_root_dir: /opt/unifi -unifi_version: 6.5.53 +unifi_version: 6.5.54 unifi_archive_url: https://www.ubnt.com/downloads/unifi/{{ unifi_version }}/UniFi.unix.zip -unifi_archive_sha1: 17fc9cf63ffc24d38d2a9723ae6437e1161675db +unifi_archive_sha1: f11da02cefef9817d62e49a3be2faf2e7248e89f unifi_manage_upgrade: True unifi_http_port: 8080 unifi_https_port: 8443 diff --git a/roles/zabbix_agent/tasks/install_Debian.yml b/roles/zabbix_agent/tasks/install_Debian.yml index ee5e04a..db60088 100644 --- a/roles/zabbix_agent/tasks/install_Debian.yml +++ b/roles/zabbix_agent/tasks/install_Debian.yml @@ -18,7 +18,7 @@ - name: Checkout Addons script git: - repo: https://git.fws.fr/fws/zabbix-agent-addons.git + repo: https://git.lapiole.org/dani/zabbix-agent-addons.git dest: /var/lib/zabbix/addons environment: - https_proxy: "{{ system_proxy | default('') }}" diff --git a/roles/zimbra/defaults/main.yml b/roles/zimbra/defaults/main.yml index f37b39e..eb11cc0 100644 --- a/roles/zimbra/defaults/main.yml +++ b/roles/zimbra/defaults/main.yml @@ -45,24 +45,24 @@ zcs_letsencrypt: False # Domain and their configuration. Used to sync LDAP with Zimbra zcs_domains: {} # zcs_domains: -# fws.fr: -# public_url: https://zm.fws.fr -# admin_url: https://zm.fws.fr:9071 +# example.org: +# public_url: https://zm.example.org +# admin_url: https://zm.example.org:9071 # ldapsync: # ldap: # servers: -# - ldap://dc1.fws.fr:389 +# - ldap://dc1.example.org:389 # schema: ad -# bind_dn: CN=Zimbra,OU=Apps,DC=fws,DC=fr +# bind_dn: CN=Zimbra,OU=Apps,DC=example,DC=org # bind_pass: s4cr3t. # users: -# base: OU=People,DC=fws,DC=fr +# base: OU=People,DC=example,DC=org # filter: (mail=*) # groups: -# base: OU=Groups,DC=fws,DC=fr +# base: OU=Groups,DC=example,DC=org # cas: # enabled: False -# server_url: https://sso.fws.fr/cas +# server_url: https://sso.example.org/cas zcs_domain_defaults: cas: diff --git a/roles/zimbra/tasks/main.yml b/roles/zimbra/tasks/main.yml index 3ca1f19..1687c87 100644 --- a/roles/zimbra/tasks/main.yml +++ b/roles/zimbra/tasks/main.yml @@ -112,7 +112,7 @@ - name: Install backup help script get_url: - url: https://git.fws.fr/dani/zimbra/raw/branch/master/zmbh/zmbh.pl + url: https://git.lapiole.org/dani/zimbra/raw/branch/master/zmbh/zmbh.pl dest: /opt/zimbra/bin/zmbh mode: '0755' tags: zcs diff --git a/roles/zimbra/tasks/zmldapsync.yml b/roles/zimbra/tasks/zmldapsync.yml index 057edc6..dd15cff 100644 --- a/roles/zimbra/tasks/zmldapsync.yml +++ b/roles/zimbra/tasks/zmldapsync.yml @@ -21,10 +21,10 @@ dest: "{{ item.dest }}" mode: "{{ item.mode }}" loop: - - url: https://git.fws.fr/dani/zimbra/raw/branch/master/zmldapsync/zmldapsync.pl + - url: https://git.lapiole.org/dani/zimbra/raw/branch/master/zmldapsync/zmldapsync.pl dest: /opt/zimbra/bin/zmldapsync mode: 755 - - url: https://git.fws.fr/dani/zimbra/raw/branch/master/zmldapsync/zmldapsync.yml + - url: https://git.lapiole.org/dani/zimbra/raw/branch/master/zmldapsync/zmldapsync.yml dest: /opt/zimbra/conf/zmldapsync.yml.dist mode: 640 tags: zcs