From 863d6d6952a6d96a1e12780f36bf744e2de8d194 Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Fri, 1 Mar 2019 10:45:55 -0500 Subject: [PATCH 1/6] Add 'roles/common/files/rsync' --- roles/common/files/rsync | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 roles/common/files/rsync diff --git a/roles/common/files/rsync b/roles/common/files/rsync new file mode 100644 index 0000000..408fcc5 --- /dev/null +++ b/roles/common/files/rsync @@ -0,0 +1,6 @@ +#!/bin/bash +# Rsync jobs for ftp.thunix.net + +rsync -rvltpHS --delete-excluded rsync://ftp.gnu.org/gnu/ /var/www/ftp.thunix.cf/gnu-ftp +rsync -rvltpHS --delete-excluded rsync://ftp.gnu.org/alpha/ /var/www/ftp.thunix.cf/gnu-alph1a +rsync -rvltpHS --delete-excluded rsync://ftp.gnu.org/old-gnu/ /var/www/ftp.thunix.cf/gnu-old \ No newline at end of file From 5fc74553110fe4a34adfec609dea575dcfab7c3c Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Fri, 1 Mar 2019 10:46:17 -0500 Subject: [PATCH 2/6] Update 'roles/common/tasks/ansible-pull.yml' --- roles/common/tasks/ansible-pull.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/common/tasks/ansible-pull.yml b/roles/common/tasks/ansible-pull.yml index 8c658d6..3b2eb2c 100644 --- a/roles/common/tasks/ansible-pull.yml +++ b/roles/common/tasks/ansible-pull.yml @@ -5,6 +5,13 @@ owner: root mode: 744 +- name: Add rsync cron job + copy: + src: ../files/rsync + dest: /etc/cron.daily/rsync + owner: root + mode: 744 + - name: Adding ansible git repo locally git: repo: 'https://tildegit.org/thunix/ansible.git' From 9c9f801fbb0496845e3720335aba0178bf536c0f Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Fri, 1 Mar 2019 10:49:08 -0500 Subject: [PATCH 3/6] Fixed typo --- roles/common/files/rsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/common/files/rsync b/roles/common/files/rsync index 408fcc5..8191fa9 100644 --- a/roles/common/files/rsync +++ b/roles/common/files/rsync @@ -2,5 +2,5 @@ # Rsync jobs for ftp.thunix.net rsync -rvltpHS --delete-excluded rsync://ftp.gnu.org/gnu/ /var/www/ftp.thunix.cf/gnu-ftp -rsync -rvltpHS --delete-excluded rsync://ftp.gnu.org/alpha/ /var/www/ftp.thunix.cf/gnu-alph1a +rsync -rvltpHS --delete-excluded rsync://ftp.gnu.org/alpha/ /var/www/ftp.thunix.cf/gnu-alpha rsync -rvltpHS --delete-excluded rsync://ftp.gnu.org/old-gnu/ /var/www/ftp.thunix.cf/gnu-old \ No newline at end of file From 2e0a79a8f13141ba617e6b8400dc98f38fb4b362 Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Fri, 1 Mar 2019 10:56:27 -0500 Subject: [PATCH 4/6] Update 'roles/common/files/mirror-rsync' --- roles/common/files/{rsync => mirror-rsync} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename roles/common/files/{rsync => mirror-rsync} (100%) diff --git a/roles/common/files/rsync b/roles/common/files/mirror-rsync similarity index 100% rename from roles/common/files/rsync rename to roles/common/files/mirror-rsync From 46afa689689486df873f78760b5585e161d6e348 Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Fri, 1 Mar 2019 10:56:37 -0500 Subject: [PATCH 5/6] Update 'roles/common/files/mirror-rsync' --- roles/common/files/mirror-rsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/common/files/mirror-rsync b/roles/common/files/mirror-rsync index 8191fa9..5b1d5d9 100644 --- a/roles/common/files/mirror-rsync +++ b/roles/common/files/mirror-rsync @@ -1,5 +1,5 @@ #!/bin/bash -# Rsync jobs for ftp.thunix.net +# Mirror rsync jobs for ftp.thunix.net rsync -rvltpHS --delete-excluded rsync://ftp.gnu.org/gnu/ /var/www/ftp.thunix.cf/gnu-ftp rsync -rvltpHS --delete-excluded rsync://ftp.gnu.org/alpha/ /var/www/ftp.thunix.cf/gnu-alpha From 4d74dc9c3c3f88b15f50e7e9bb0bcb90155a95b1 Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Fri, 1 Mar 2019 10:56:57 -0500 Subject: [PATCH 6/6] Update 'roles/common/tasks/ansible-pull.yml' --- roles/common/tasks/ansible-pull.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/common/tasks/ansible-pull.yml b/roles/common/tasks/ansible-pull.yml index 3b2eb2c..02af5b2 100644 --- a/roles/common/tasks/ansible-pull.yml +++ b/roles/common/tasks/ansible-pull.yml @@ -5,10 +5,10 @@ owner: root mode: 744 -- name: Add rsync cron job +- name: Add mirror rsync cron job copy: - src: ../files/rsync - dest: /etc/cron.daily/rsync + src: ../files/mirror-rsync + dest: /etc/cron.daily/mirror-rsync owner: root mode: 744