From 6842f88f01f7c94a98014bc6e0eca234c24d3292 Mon Sep 17 00:00:00 2001
From: jaw <jaw@ocf.berkeley.edu>
Date: Thu, 2 Jul 2020 02:30:31 -0700
Subject: [PATCH] Add devuan packages sync scripts

They currently don't have a timestamp file
---
 .../files/project/devuan/sync-archive         |  3 ++
 .../ocf_mirrors/manifests/projects/devuan.pp  | 47 ++++++++++++++-----
 2 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 modules/ocf_mirrors/files/project/devuan/sync-archive

diff --git a/modules/ocf_mirrors/files/project/devuan/sync-archive b/modules/ocf_mirrors/files/project/devuan/sync-archive
new file mode 100644
index 000000000..d7c486f06
--- /dev/null
+++ b/modules/ocf_mirrors/files/project/devuan/sync-archive
@@ -0,0 +1,3 @@
+#!/bin/sh -eu
+/usr/local/bin/rsync-no-vanished -e 'ssh -i /opt/mirrors/project/devuan/devuan_rsa' \
+--delete -razX files.devuan.org::devuan /opt/mirrors/ftp/devuan-cd
diff --git a/modules/ocf_mirrors/manifests/projects/devuan.pp b/modules/ocf_mirrors/manifests/projects/devuan.pp
index ba47c151d..0bc523e16 100644
--- a/modules/ocf_mirrors/manifests/projects/devuan.pp
+++ b/modules/ocf_mirrors/manifests/projects/devuan.pp
@@ -1,18 +1,43 @@
 class ocf_mirrors::projects::devuan {
   file {
+    default:
+      owner => mirrors,
+      group => mirrors;
+
     '/opt/mirrors/project/devuan-cd':
-      ensure  => directory,
-      source  => 'puppet:///modules/ocf_mirrors/project/devuan-cd',
-      owner   => mirrors,
-      group   => mirrors,
-      mode    => '0755',
-      recurse => true;
+      ensure => directory,
+      mode   => '0755';
+
+    '/opt/mirrors/project/devuan-cd/sync-releases':
+      source => 'puppet:///modules/ocf_mirrors/project/devuan-cd/sync-archive',
+      mode   => '0755';
+
+    '/opt/mirrors/project/devuan':
+      ensure => directory,
+      mode   => '0755';
+
+    '/opt/mirrors/project/devuan/sync-releases':
+      source => 'puppet:///modules/ocf_mirrors/project/devuan/sync-archive',
+      mode   => '0755';
+
+    # we are registered with the Devuan project and have an SSH key for the
+    # master upstream mirror
+    '/opt/mirrors/project/devuan/devuan_rsa':
+      source    => 'puppet:///private/mirrors/devuan',
+      mode      => '0600',
+      show_diff => false;
   }
 
-  ocf_mirrors::timer { 'devuan-cd':
-    exec_start => '/opt/mirrors/project/devuan-cd/sync-archive',
-    hour       => '0/6',
-    minute     => '57',
-    require    => File['/opt/mirrors/project/devuan-cd'];
+  ocf_mirrors::timer {
+    'devuan-cd':
+      exec_start => '/opt/mirrors/project/devuan-cd/sync-archive',
+      hour       => '0/6',
+      minute     => '57',
+      require    => File['/opt/mirrors/project/devuan-cd'];
+
+    'devuan':
+      exec_start => '/opt/mirrors/project/devuan/sync-archive',
+      minute     => '3/30', # at 3 and 33th minute
+      require    => File['/opt/mirrors/project/devuan'];
   }
 }