refactor

3 files changed, 4 insertions, 96 deletions

diff --git a/modules/partofme/files/sshd_config.borg b/modules/partofme/files/sshd_config.borg
deleted file mode 100644
index 76c199b..0000000
--- a/modules/partofme/files/sshd_config.borg
+++ /dev/null
@@ -1,5 +0,0 @@
-Match User borg
-        ClientAliveInterval 10
-        ClientAliveCountMax 30
-
-# vim:ft=sshdconfig
diff --git a/modules/partofme/manifests/backups.pp b/modules/partofme/manifests/backups.pp
index 74662cd..45f9976 100644
--- a/modules/partofme/manifests/backups.pp
+++ b/modules/partofme/manifests/backups.pp
@@ -41,79 +41,17 @@ class partofme::backups {
 
   #############################
 
-  package { 'borg':
-    ensure => installed;
-  }
-
-  group { 'borg':
-    ensure => present;
-  }
-
-  user { 'borg':
-    ensure => present,
-    gid => 'borg',
-    home => '/media/persistent/borg';
-  }
-
+  include borg
   file {
-    "/media/persistent/borg/":
-      ensure => directory,
-      owner => 'borg',
-      group => 'borg',
-      require => User['borg'];
-    "/media/persistent/borg/.ssh":
-      ensure => directory,
-      owner => 'borg',
-      group => 'borg',
-      require => User['borg'];
     "/media/persistent/borg/.ssh/authorized_keys":
       source => 'puppet:///modules/partofme/borg_authorized_keys',
       owner => 'borg',
       group => 'borg',
       mode => '0600',
-      require => File["/media/persistent/borg/.ssh"];
-  }
-
-  sshd::configsection { 'borg':
-    source => 'puppet:///modules/partofme/sshd_config.borg';
+      require => Class['borg'];
   }
 
-  package { 'borgmatic':
-    ensure => installed;
-  }
-
-  $borgmatic_passphrase = secret::value('borgmatic_passphrase')
-  file {
-    "/etc/borgmatic":
-      ensure => directory;
-    "/etc/borgmatic/config.yaml":
-      content => template('partofme/borgmatic_config.yaml'),
-      require => File["/etc/borgmatic"];
-  }
-
-  secret { "/etc/borgmatic/borg_ssh_key":
-    source => 'borg_ssh_key',
-    require => File["/etc/borgmatic"];
-  }
-
-  exec { '/usr/bin/borgmatic init --encryption repokey':
-    environment => [
-      "BORG_PASSPHRASE=${borgmatic_passphrase}",
-    ],
-    unless => '/usr/bin/borgmatic info > /dev/null',
-    require => [
-      Package['borgmatic'],
-      File['/etc/borgmatic/config.yaml'],
-    ]
-  }
-
-  service { 'borgmatic.timer':
-    ensure => running,
-    enable => true,
-    require => [
-      Package['borgmatic'],
-      File['/etc/borgmatic/config.yaml'],
-      Exec['/usr/bin/borgmatic init --encryption repokey'],
-    ];
+  class { 'borgmatic':
+    host => 'localhost';
   }
 }
diff --git a/modules/partofme/templates/borgmatic_config.yaml b/modules/partofme/templates/borgmatic_config.yaml
deleted file mode 100644
index 895cfe8..0000000
--- a/modules/partofme/templates/borgmatic_config.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-location:
-    source_directories:
-        - /home
-        - /etc
-        - /usr/local/bin
-    repositories:
-        - borg@localhost:partofme
-    atime: false
-    exclude_patterns:
-        - /home/*/.cache
-        - /home/*/.cargo
-        - /home/*/.rustup
-        - /home/doy/coding/*/target
-        - /home/doy/mnt
-        - /home/doy/tmp
-
-storage:
-    encryption_passphrase: "<%= @borgmatic_passphrase %>"
-    ssh_command: /usr/bin/ssh -i /etc/borgmatic/borg_ssh_key -o StrictHostKeyChecking=no
-
-retention:
-    keep_daily: 7
-    keep_weekly: 4
-    keep_monthly: 12
-    keep_yearly: 1000