diff --git a/host_vars/eclat.adm.crans.org.yml b/host_vars/eclat.adm.crans.org.yml index be5af005c78f3b731b96f09c7984c32a53cdea50..40e3b98e7b48340fd9bba6786a9f66125b346367 100644 --- a/host_vars/eclat.adm.crans.org.yml +++ b/host_vars/eclat.adm.crans.org.yml @@ -23,3 +23,6 @@ loc_rsyncd: path: /mirror/pub/ comment: CR@NS MIRROR hosts_allow: "*" + +loc_vsftpd: + root: /mirror/pub diff --git a/host_vars/ptf.adm.crans.org.yml b/host_vars/ptf.adm.crans.org.yml index 46de9db2fa5076d208f31ec3e63a0d179fddc71d..6ce8a9527a7669ca681608196c39449231e44cab 100644 --- a/host_vars/ptf.adm.crans.org.yml +++ b/host_vars/ptf.adm.crans.org.yml @@ -64,3 +64,6 @@ loc_nginx: - "mp4" - "mp4_buffer_size 1m" - "mp4_max_buffer_size 5m" + +loc_vsftpd: + root: /ftp diff --git a/hosts b/hosts index 4a094195f2885e9a67edcd4499f93a6cf76afa17..4b46ccb87aa74ab5c96899fa87b38090a3469a90 100644 --- a/hosts +++ b/hosts @@ -31,7 +31,6 @@ routeur-gulp.cachan-adm.crans.org monitoring.adm.crans.org [certbot] -charybde.adm.crans.org sputnik.adm.crans.org [certbot:children] @@ -43,6 +42,7 @@ mailman radius # We use certbot to manage LE certificates reverseproxy thelounge +vsftpd [dhcp:children] routeurs_vm @@ -221,6 +221,8 @@ sam.adm.crans.org [vsftpd] charybde.adm.crans.org +eclat.adm.crans.org +ptf.adm.crans.org [wiki] kiwi.adm.crans.org diff --git a/roles/vsftpd/templates/rsyncd.conf.j2 b/roles/vsftpd/templates/rsyncd.conf.j2 deleted file mode 100644 index b900c471794f21f042fd4a73b1e1a96f81820bcb..0000000000000000000000000000000000000000 --- a/roles/vsftpd/templates/rsyncd.conf.j2 +++ /dev/null @@ -1,37 +0,0 @@ -{{ ansible_header | comment }} - -# GLOBAL OPTIONS -log file=/var/log/rsyncd -# for pid file, dont' use /var/run/rsync.pid unless you're not going to run -# rsync out of the init.d script. The /var/run/rsyncd.pid below is OK. -pid file=/var/run/rsyncd.pid -syslog facility=daemon - -uid = root -gid = root -use chroot = no -read only = yes -# On ne liste pas les modules -list = no -#max connections=2 -ignore errors = no -ignore nonreadable = yes -# ne loggue pas tous les fichiers -transfer logging = no -dont compress = *.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz -# verifie les droits de /etc/rsyncd.secrets -strict modes = yes -# personne n'accede aux modules par defaut -hosts deny = * - -# MODULE OPTIONS -{% for module in rsyncd.modules -%} -[{{ module.name }}] -path = {{ module.path }} -comment = {{ module.comment }} -uid = nobody -gid = nogroup -hosts allow = {{ module.hosts_allow }} -read only = yes - -{% endfor %}