From f053558e0764244609abb9985ed2781bed7519b3 Mon Sep 17 00:00:00 2001 From: shirenn Date: Sat, 19 Jun 2021 01:00:38 +0200 Subject: [PATCH] =?UTF-8?q?[hosts]=20charybde=20reste=20=C3=A0=20chanca?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- group_vars/mirror_backend.yml | 6 +-- group_vars/rsyncd.yml | 2 +- host_vars/charybde.adm.crans.org.yml | 51 ------------------ host_vars/charybde.cachan-adm.crans.org.yml | 57 +++++++++++++++++++++ hosts | 12 ++--- 5 files changed, 67 insertions(+), 61 deletions(-) delete mode 100644 host_vars/charybde.adm.crans.org.yml create mode 100644 host_vars/charybde.cachan-adm.crans.org.yml diff --git a/group_vars/mirror_backend.yml b/group_vars/mirror_backend.yml index 9e2c805b..b4797866 100644 --- a/group_vars/mirror_backend.yml +++ b/group_vars/mirror_backend.yml @@ -10,17 +10,17 @@ glob_ftpsync: - name: main dest: debian cron_time: "25 1,13" - rsync_host: syncproxy.eu.debian.org + rsync_host: ftp.fr.debian.org rsync_path: debian - name: security dest: debian-security cron_time: "40 *" - rsync_host: rsync.security.debian.org + rsync_host: ftp.fr.debian.org rsync_path: debian-security - name: backports dest: debian-backports cron_time: " 7 3,15" - rsync_host: syncproxy.eu.debian.org + rsync_host: ftp.fr.debian.org rsync_path: debian-backports glob_rsync_mirror: diff --git a/group_vars/rsyncd.yml b/group_vars/rsyncd.yml index 91b0b430..25239265 100644 --- a/group_vars/rsyncd.yml +++ b/group_vars/rsyncd.yml @@ -6,7 +6,7 @@ glob_rsyncd: comment: CRANS FTP hosts_allow: "*" - name: videolan - path: /pool/memorial/videolan + path: /pool/mirror/pub/videolan comment: VideoLAN repository hosts_allow: "*" diff --git a/host_vars/charybde.adm.crans.org.yml b/host_vars/charybde.adm.crans.org.yml deleted file mode 100644 index 5ddb88a2..00000000 --- a/host_vars/charybde.adm.crans.org.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -loc_ftpsync: - root: /pool/mirror/pub - -loc_rsync_mirror: - root: /pool/mirror/pub - -loc_apt_mirror: - root: /pool/mirror/pub - -loc_nginx: - service_name: ftp - ssl: [] - servers: - - server_name: - - "mirror" - - "mirror.*" - root: "/pool/mirror/pub" - locations: - - filter: "/" - params: - - "autoindex on" - - "autoindex_exact_size off" - - "add_before_body /.html/HEADER.html" - - "add_after_body /.html/FOOTER.html" - - server_name: - - "ftp" - - "ftp.*" - - "ftps" - - "ftps.*" - root: /pool/memorial - locations: - - filter: "/" - params: - - "autoindex on" - - "autoindex_exact_size off" - - "add_before_body /.html/HEADER.html" - - "add_after_body /.html/FOOTER.html" - - filter: ~ ^(\/pub)?(\/debian|\/ubuntu|\/archlinux|\/videolan)(.*)$ - params: - - return 301 http://mirror.crans.org$2$3 - - filter: "/events" - params: - - "autoindex on" - - "autoindex_exact_size off" - - "add_before_body /.html/HEADER.html" - - "add_after_body /.html/FOOTER.html" - - "mp4" - - "mp4_buffer_size 1m" - - "mp4_max_buffer_size 5m" - diff --git a/host_vars/charybde.cachan-adm.crans.org.yml b/host_vars/charybde.cachan-adm.crans.org.yml new file mode 100644 index 00000000..366f8a16 --- /dev/null +++ b/host_vars/charybde.cachan-adm.crans.org.yml @@ -0,0 +1,57 @@ +--- +loc_home_nounou: + ip: 172.17.10.9 + mountpoint: /rpool/home + +loc_ldap: + servers: + - 172.17.10.9 + base: 'dc=crans,dc=org' + +loc_ntp_client: + servers: + - terenez.cachan-adm.crans.org + +debian_mirror: http://mirror.cachan-adm.crans.org/debian + +loc_borg: + remote: + - borg@zephir.cachan-adm.crans.org:/backup/borg/{{ ansible_hostname }} + ssh_options: "" + +glob_prometheus_node_exporter: + listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +glob_prometheus_nginx_exporter: + listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}" + +loc_rsyslog_client: + server: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}" + +loc_vsftpd: + root: /pool/mirror/pub + +loc_ftpsync: + root: /pool/mirror/pub + +loc_rsync_mirror: + root: /pool/mirror/pub + +loc_apt_mirror: + root: /pool/mirror/pub + +loc_nginx: + service_name: ftp + ssl: [] + servers: + - server_name: + - "mirror" + - "mirror.*" + root: "/pool/mirror/pub" + locations: + - filter: "/" + params: + - "autoindex on" + - "autoindex_exact_size off" + - "add_before_body /.html/HEADER.html" + - "add_after_body /.html/FOOTER.html" diff --git a/hosts b/hosts index 86f8a47d..dc7d43a4 100644 --- a/hosts +++ b/hosts @@ -111,11 +111,11 @@ gulp.cachan-adm.crans.org tealc.adm.crans.org [mirror_backend] -charybde.adm.crans.org +charybde.cachan-adm.crans.org eclat.adm.crans.org [mirror_frontend] -charybde.adm.crans.org +charybde.cachan-adm.crans.org tealc.adm.crans.org [nginx] @@ -135,7 +135,7 @@ thelounge wiki [ntp_server] -charybde.adm.crans.org +charybde.cachan-adm.crans.org eclat.adm.crans.org terenez.cachan-adm.crans.org @@ -198,7 +198,7 @@ routeur-sam.adm.crans.org routeur-gulp.cachan-adm.crans.org [rsyncd] -charybde.adm.crans.org +charybde.cachan-adm.crans.org eclat.adm.crans.org [rsyslog_server] @@ -224,7 +224,7 @@ jack.adm.crans.org sam.adm.crans.org [vsftpd] -charybde.adm.crans.org +charybde.cachan-adm.crans.org eclat.adm.crans.org ptf.adm.crans.org @@ -236,7 +236,7 @@ sputnik.adm.crans.org routeurs_vm [crans_physical] -charybde.adm.crans.org +charybde.cachan-adm.crans.org #cochon.adm.crans.org gulp.cachan-adm.crans.org omnomnom.cachan-adm.crans.org