diff options
| author | Jesse Luehrs <doy@tozt.net> | 2018-11-15 01:13:54 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2018-11-15 01:13:54 -0500 |
| commit | 69db44bec5bdf316b83ce2daef37e9a63859b0ed (patch) | |
| tree | 15e3b80584d41938bcfa5dfd7e7441917bf59acd | |
| parent | 2c44e9a2ce63afe115011435b63b1f9bfd27f76d (diff) | |
| download | puppet-tozt-69db44bec5bdf316b83ce2daef37e9a63859b0ed.tar.gz puppet-tozt-69db44bec5bdf316b83ce2daef37e9a63859b0ed.zip | |
move vpn into the base
| -rw-r--r-- | manifests/partofme.pp | 1 | ||||
| -rw-r--r-- | manifests/tozt.pp | 1 | ||||
| -rw-r--r-- | modules/base/manifests/init.pp | 1 | ||||
| -rw-r--r-- | modules/base/manifests/vpn.pp (renamed from modules/tozt/manifests/vpn.pp) | 0 | ||||
| -rw-r--r-- | modules/partofme/manifests/vpn.pp | 3 |
5 files changed, 1 insertions, 5 deletions
diff --git a/manifests/partofme.pp b/manifests/partofme.pp index ac0ddc5..0450128 100644 --- a/manifests/partofme.pp +++ b/manifests/partofme.pp @@ -14,5 +14,4 @@ node 'partofme.localdomain' { class { 'partofme::backups': default_user => $default_user; } - include partofme::vpn } diff --git a/manifests/tozt.pp b/manifests/tozt.pp index c3461b2..40d81a4 100644 --- a/manifests/tozt.pp +++ b/manifests/tozt.pp @@ -22,5 +22,4 @@ node 'tozt.localdomain' { include tozt::services include tozt::site include tozt::ttrss - include tozt::vpn } diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp index f90b6eb..d476624 100644 --- a/modules/base/manifests/init.pp +++ b/modules/base/manifests/init.pp @@ -3,6 +3,7 @@ class base($default_user, $persistent_data=undef) { contain base::operatingsystem contain base::services contain base::tools + contain base::vpn class { 'base::users': default_user => $default_user, diff --git a/modules/tozt/manifests/vpn.pp b/modules/base/manifests/vpn.pp index aa84f53..aa84f53 100644 --- a/modules/tozt/manifests/vpn.pp +++ b/modules/base/manifests/vpn.pp diff --git a/modules/partofme/manifests/vpn.pp b/modules/partofme/manifests/vpn.pp deleted file mode 100644 index 456ea17..0000000 --- a/modules/partofme/manifests/vpn.pp +++ /dev/null @@ -1,3 +0,0 @@ -class partofme::vpn { - include wireguard -} |