summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2018-11-13 00:29:30 -0500
committerJesse Luehrs <doy@tozt.net>2018-11-13 00:33:24 -0500
commit8cbc72093f0f1b100a61a29a9bd38280ee9cfbc0 (patch)
treeff9193d8d3b5ba3ba150a57c8a41146850587ebc /modules
parentbf33ac997636c4b6c199cfff1e171ffaff437c91 (diff)
downloadpuppet-tozt-8cbc72093f0f1b100a61a29a9bd38280ee9cfbc0.tar.gz
puppet-tozt-8cbc72093f0f1b100a61a29a9bd38280ee9cfbc0.zip
try moving to manifests and nodes
Diffstat (limited to 'modules')
-rw-r--r--modules/tozt/files/puppet-tozt2
-rw-r--r--modules/tozt/manifests/init.pp21
2 files changed, 1 insertions, 22 deletions
diff --git a/modules/tozt/files/puppet-tozt b/modules/tozt/files/puppet-tozt
index 4ea27ef..6d06998 100644
--- a/modules/tozt/files/puppet-tozt
+++ b/modules/tozt/files/puppet-tozt
@@ -3,4 +3,4 @@ set -eu
set -o pipefail
(cd /usr/local/share/puppet-tozt && sudo git pull)
-sudo puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules -e 'include tozt'
+sudo puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules /usr/local/share/puppet-tozt/manifests
diff --git a/modules/tozt/manifests/init.pp b/modules/tozt/manifests/init.pp
deleted file mode 100644
index f7997da..0000000
--- a/modules/tozt/manifests/init.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class tozt {
- include tozt::users
-
- Package::Makepkg {
- build_user => 'doy',
- }
-
- Tozt::User['doy'] -> Package::Makepkg<| build_user == 'doy' |>
-
- include tozt::bootstrap
- include tozt::backups
- include tozt::git
- include tozt::misc
- include tozt::pass
- include tozt::paste
- include tozt::site
- include tozt::services
- include tozt::tools
- include tozt::ttrss
- include tozt::vpn
-}