From dd28dcf3d620a4ac7d0a1532b812213cf094cd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Wed, 12 Jan 2022 02:26:25 +0100 Subject: Revert "Move webdav into profiles." It actually reverts the non-need for the nginx module webdav_ext. Since Omnifocus requires PROPFIND. This reverts commit edf6ffe8b399679ba28cc5e558a6838919dd1ee8. --- modules/systemd_mount/manifests/init.pp | 42 --------------------------- modules/systemd_mount/templates/automount.epp | 11 ------- modules/systemd_mount/templates/mount.epp | 13 --------- 3 files changed, 66 deletions(-) delete mode 100644 modules/systemd_mount/manifests/init.pp delete mode 100644 modules/systemd_mount/templates/automount.epp delete mode 100644 modules/systemd_mount/templates/mount.epp (limited to 'modules/systemd_mount') diff --git a/modules/systemd_mount/manifests/init.pp b/modules/systemd_mount/manifests/init.pp deleted file mode 100644 index ff081e4..0000000 --- a/modules/systemd_mount/manifests/init.pp +++ /dev/null @@ -1,42 +0,0 @@ -define systemd_mount ( - String $what, # elrond:/files - String $where, # /usr/net - Boolean $automount = false, - String $wantedBy = 'default.target', -) { - - $mostly_fixed = regsubst($where, '/', '-', 'G') - $fixed = if $mostly_fixed[0] == '-' { - $mostly_fixed[1, -1] # drop first char - } else { - $mostly_fixed - } - - systemd::unit_file { "${fixed}.mount": - content => epp('systemd_mount/mount.epp', { - what => $what, - where => $where, - wantedby => if ($automount) { '' } else { "WantedBy=${wantedBy}" }, - }), - } - - if ($automount) { - systemd::unit_file { "${fixed}.automount": - content => epp('systemd_mount/automount.epp', { - where => $where, - wantedBy => "WantedBy=${wantedBy}", - }), - } - - service { "${fixed}.automount": - enable => true, - ensure => running, - } - } else { - service { "${fixed}.mount": - enable => true, - ensure => running, - } - } - -} diff --git a/modules/systemd_mount/templates/automount.epp b/modules/systemd_mount/templates/automount.epp deleted file mode 100644 index c65f2ae..0000000 --- a/modules/systemd_mount/templates/automount.epp +++ /dev/null @@ -1,11 +0,0 @@ -<%- | String $where, - String $wantedBy, -| -%> - -[Unit] - -[Install] -<%= $wantedBy %> - -[Automount] -Where=<%= $where %> diff --git a/modules/systemd_mount/templates/mount.epp b/modules/systemd_mount/templates/mount.epp deleted file mode 100644 index 54d191a..0000000 --- a/modules/systemd_mount/templates/mount.epp +++ /dev/null @@ -1,13 +0,0 @@ -<%- | String $where, - String $what, - String $wantedby, -| -%> - -[Unit] - -[Install] -<%= $wantedby %> - -[Mount] -Where=<%= $where %> -What=<%= $what %> -- cgit v1.2.3