From 2dccb0c45043d0fcfa5f3f2b33c91502c3539cf0 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Tue, 14 Jul 2020 14:10:39 +0200
Subject: [PATCH] Move ftpsync and owncloud to plays/

---
 base.yml           |  2 ++
 plays/mirror.yml   | 77 +++++++++++++++++++++++++++++++++++++++++++
 plays/owncloud.yml |  7 ++++
 services_web.yml   | 82 ----------------------------------------------
 4 files changed, 86 insertions(+), 82 deletions(-)
 create mode 100755 plays/mirror.yml
 create mode 100755 plays/owncloud.yml

diff --git a/base.yml b/base.yml
index a30279a9..85ffbb65 100755
--- a/base.yml
+++ b/base.yml
@@ -77,3 +77,5 @@
 - import_playbook: plays/dhcp.yml
 - import_playbook: plays/dns.yml
 - import_playbook: plays/wireguard.yml
+- import_playbook: plays/mirror.yml
+- import_playbook: plays/owncloud.yml
diff --git a/plays/mirror.yml b/plays/mirror.yml
new file mode 100755
index 00000000..7d691220
--- /dev/null
+++ b/plays/mirror.yml
@@ -0,0 +1,77 @@
+#!/usr/bin/env ansible-playbook
+---
+# Debian and Ubuntu mirrors
+- hosts: charybde.adm.crans.org
+  vars:
+    ftpsync:
+      - name: main
+        dest: /pubftp/pub/debian/
+        cron_time: "25 1,13"
+        rsync_host: debian.proxad.net
+        rsync_path: debian
+
+      # https://lists.debian.org/debian-mirrors-announce/2020/03/msg00000.html
+      - name: security
+        dest: /pubftp/pub/debian-security/
+        cron_time: "40    *"
+        rsync_host: rsync.security.debian.org
+        rsync_path: debian-security
+
+      - name: backports
+        dest: /pubftp/pub/debian-backports/
+        cron_time: " 7 3,15"
+        rsync_host: debian.proxad.net
+        rsync_path: debian-backports
+
+      - name: ubuntu
+        dest: /pubftp/pub/ubuntu/
+        cron_time: "55 5,17"
+        rsync_host: archive.ubuntu.com
+        rsync_path: ubuntu
+
+    rsync_mirror:
+      - name: videolan
+        dest: /pubftp/pub/videolan
+        cron_time: "03 10,14,18,22,2,6"
+        rsync_host: rsync.videolan.org
+        rsync_path: videolan-ftp
+
+      - name: debian
+        dest: /pubftp/pub/distributions/linux/debian
+        cron_time: "00 5"
+        rsync_host: cdimage.debian.org
+        rsync_path: cdimage/release
+
+      - name: ubuntu
+        dest: /pubftp/pub/distributions/linux/ubuntu
+        cron_time: "00 5"
+        rsync_host: cdimage.ubuntu.com
+        rsync_path: cdimage/releases
+
+      - name: xubuntu
+        dest: /pubftp/pub/distributions/linux/xubuntu
+        cron_time: "00 5"
+        rsync_host: cdimage.ubuntu.com
+        rsync_path: cdimage/xubuntu/releases
+
+      - name: kubuntu
+        dest: /pubftp/pub/distributions/linux/kubuntu
+        cron_time: "00 5"
+        rsync_host: cdimage.ubuntu.com
+        rsync_path: cdimage/kubuntu/releases
+
+      - name: lubuntu
+        dest: /pubftp/pub/distributions/linux/lubuntu
+        cron_time: "00 5"
+        rsync_host: cdimage.ubuntu.com
+        rsync_path: cdimage/lubuntu/releases
+
+      - name: ubuntu-mate
+        dest: /pubftp/pub/distributions/linux/ubuntu-mate
+        cron_time: "00 5"
+        rsync_host: cdimage.ubuntu.com
+        rsync_path: cdimage/ubuntu-mate/releases
+  roles:
+    - ftpsync
+    - rsync-mirror
+    - nginx-pubftp
diff --git a/plays/owncloud.yml b/plays/owncloud.yml
new file mode 100755
index 00000000..3280165f
--- /dev/null
+++ b/plays/owncloud.yml
@@ -0,0 +1,7 @@
+#!/usr/bin/env ansible-playbook
+---
+# Deploy OwnCloud
+- hosts: owncloud-srv.adm.crans.org
+  roles:
+    - owncloud
+    - owncloud-autofs
diff --git a/services_web.yml b/services_web.yml
index 7caad18b..20215a11 100755
--- a/services_web.yml
+++ b/services_web.yml
@@ -26,85 +26,3 @@
 
 - hosts: ethercalc-srv.adm.crans.org
   roles: ["ethercalc"]
-
-# Deploy OwnCloud
-- hosts: owncloud-srv.adm.crans.org
-  roles:
-    - owncloud
-    - owncloud-autofs
-
-# Mirrors
-- hosts: charybde.adm.crans.org
-  vars:
-    ftpsync:
-      - name: main
-        dest: /pubftp/pub/debian/
-        cron_time: "25 1,13"
-        rsync_host: debian.proxad.net
-        rsync_path: debian
-
-      # https://lists.debian.org/debian-mirrors-announce/2020/03/msg00000.html
-      - name: security
-        dest: /pubftp/pub/debian-security/
-        cron_time: "40    *"
-        rsync_host: rsync.security.debian.org
-        rsync_path: debian-security
-
-      - name: backports
-        dest: /pubftp/pub/debian-backports/
-        cron_time: " 7 3,15"
-        rsync_host: debian.proxad.net
-        rsync_path: debian-backports
-
-      - name: ubuntu
-        dest: /pubftp/pub/ubuntu/
-        cron_time: "55 5,17"
-        rsync_host: archive.ubuntu.com
-        rsync_path: ubuntu
-
-    rsync_mirror:
-      - name: videolan
-        dest: /pubftp/pub/videolan
-        cron_time: "03 10,14,18,22,2,6"
-        rsync_host: rsync.videolan.org
-        rsync_path: videolan-ftp
-
-      - name: debian
-        dest: /pubftp/pub/distributions/linux/debian
-        cron_time: "00 5"
-        rsync_host: cdimage.debian.org
-        rsync_path: cdimage/release
-
-      - name: ubuntu
-        dest: /pubftp/pub/distributions/linux/ubuntu
-        cron_time: "00 5"
-        rsync_host: cdimage.ubuntu.com
-        rsync_path: cdimage/releases
-
-      - name: xubuntu
-        dest: /pubftp/pub/distributions/linux/xubuntu
-        cron_time: "00 5"
-        rsync_host: cdimage.ubuntu.com
-        rsync_path: cdimage/xubuntu/releases
-
-      - name: kubuntu
-        dest: /pubftp/pub/distributions/linux/kubuntu
-        cron_time: "00 5"
-        rsync_host: cdimage.ubuntu.com
-        rsync_path: cdimage/kubuntu/releases
-
-      - name: lubuntu
-        dest: /pubftp/pub/distributions/linux/lubuntu
-        cron_time: "00 5"
-        rsync_host: cdimage.ubuntu.com
-        rsync_path: cdimage/lubuntu/releases
-
-      - name: ubuntu-mate
-        dest: /pubftp/pub/distributions/linux/ubuntu-mate
-        cron_time: "00 5"
-        rsync_host: cdimage.ubuntu.com
-        rsync_path: cdimage/ubuntu-mate/releases
-  roles:
-    - ftpsync
-    - rsync-mirror
-    - nginx-pubftp