actually, let's make this shared again

79 files changed, 3 insertions, 3 deletions

diff --git a/bin/helpers/launch-tozt b/bin/helpers/launch-tozt
index 3eb1ae1..7b23894 100755
--- a/bin/helpers/launch-tozt
+++ b/bin/helpers/launch-tozt
@@ -65,7 +65,7 @@ if remote test ! -e /usr/bin/pacman; then
 fi
 
 ensure_conf_exists
-scp -r /mnt/puppet/tozt/ root@"$host":/usr/local/share/puppet-tozt/tozt/secret/files
-remote "cd '$conf_location' && puppet apply --modulepath=./tozt -e 'include tozt'"
+scp -r /mnt/puppet/tozt/ root@"$host":/usr/local/share/puppet-tozt/modules/secret/files
+remote "cd '$conf_location' && puppet apply --modulepath=./modules -e 'include tozt'"
 
 echo "Done"
diff --git a/tozt/c_toolchain/manifests/init.pp b/modules/c_toolchain/manifests/init.pp
index 2f9a364..2f9a364 100644
--- a/tozt/c_toolchain/manifests/init.pp
+++ b/modules/c_toolchain/manifests/init.pp
diff --git a/tozt/certbot/files/bootstrap-certbot b/modules/certbot/files/bootstrap-certbot
index 5a563b2..5a563b2 100755
--- a/tozt/certbot/files/bootstrap-certbot
+++ b/modules/certbot/files/bootstrap-certbot
diff --git a/tozt/certbot/files/reload-cert b/modules/certbot/files/reload-cert
index 9ca23e5..9ca23e5 100644
--- a/tozt/certbot/files/reload-cert
+++ b/modules/certbot/files/reload-cert
diff --git a/tozt/certbot/manifests/init.pp b/modules/certbot/manifests/init.pp
index 27d59a6..27d59a6 100644
--- a/tozt/certbot/manifests/init.pp
+++ b/modules/certbot/manifests/init.pp
diff --git a/tozt/certbot/templates/certbot b/modules/certbot/templates/certbot
index 9568fe1..9568fe1 100644
--- a/tozt/certbot/templates/certbot
+++ b/modules/certbot/templates/certbot
diff --git a/tozt/conf/manifests/init.pp b/modules/conf/manifests/init.pp
index 36e5f22..36e5f22 100644
--- a/tozt/conf/manifests/init.pp
+++ b/modules/conf/manifests/init.pp
diff --git a/tozt/conf/manifests/user.pp b/modules/conf/manifests/user.pp
index b5af5b2..b5af5b2 100644
--- a/tozt/conf/manifests/user.pp
+++ b/modules/conf/manifests/user.pp
diff --git a/tozt/cron/manifests/init.pp b/modules/cron/manifests/init.pp
index 9181c40..9181c40 100644
--- a/tozt/cron/manifests/init.pp
+++ b/modules/cron/manifests/init.pp
diff --git a/tozt/duplicati/manifests/init.pp b/modules/duplicati/manifests/init.pp
index 643dd43..643dd43 100644
--- a/tozt/duplicati/manifests/init.pp
+++ b/modules/duplicati/manifests/init.pp
diff --git a/tozt/fail2ban/files/jail.local b/modules/fail2ban/files/jail.local
index 00329d7..00329d7 100644
--- a/tozt/fail2ban/files/jail.local
+++ b/modules/fail2ban/files/jail.local
diff --git a/tozt/fail2ban/manifests/init.pp b/modules/fail2ban/manifests/init.pp
index 5ca6483..5ca6483 100644
--- a/tozt/fail2ban/manifests/init.pp
+++ b/modules/fail2ban/manifests/init.pp
diff --git a/tozt/git/manifests/init.pp b/modules/git/manifests/init.pp
index bfb60ad..bfb60ad 100644
--- a/tozt/git/manifests/init.pp
+++ b/modules/git/manifests/init.pp
diff --git a/tozt/git/manifests/server.pp b/modules/git/manifests/server.pp
index 76b02b6..76b02b6 100644
--- a/tozt/git/manifests/server.pp
+++ b/modules/git/manifests/server.pp
diff --git a/tozt/haveged/manifests/init.pp b/modules/haveged/manifests/init.pp
index 05ae5f8..05ae5f8 100644
--- a/tozt/haveged/manifests/init.pp
+++ b/modules/haveged/manifests/init.pp
diff --git a/tozt/locate/files/updatedb b/modules/locate/files/updatedb
index 21f2681..21f2681 100644
--- a/tozt/locate/files/updatedb
+++ b/modules/locate/files/updatedb
diff --git a/tozt/locate/manifests/init.pp b/modules/locate/manifests/init.pp
index 182e3b4..182e3b4 100644
--- a/tozt/locate/manifests/init.pp
+++ b/modules/locate/manifests/init.pp
diff --git a/tozt/mail/manifests/sender.pp b/modules/mail/manifests/sender.pp
index ef30b2a..ef30b2a 100644
--- a/tozt/mail/manifests/sender.pp
+++ b/modules/mail/manifests/sender.pp
diff --git a/tozt/nginx/files/dhparam.pem b/modules/nginx/files/dhparam.pem
index 4aa2270..4aa2270 100644
--- a/tozt/nginx/files/dhparam.pem
+++ b/modules/nginx/files/dhparam.pem
diff --git a/tozt/nginx/files/mime.types.paste b/modules/nginx/files/mime.types.paste
index a32e153..a32e153 100644
--- a/tozt/nginx/files/mime.types.paste
+++ b/modules/nginx/files/mime.types.paste
diff --git a/tozt/nginx/files/nginx.conf b/modules/nginx/files/nginx.conf
index 895330e..895330e 100644
--- a/tozt/nginx/files/nginx.conf
+++ b/modules/nginx/files/nginx.conf
diff --git a/tozt/nginx/files/ssl b/modules/nginx/files/ssl
index 6248ac8..6248ac8 100644
--- a/tozt/nginx/files/ssl
+++ b/modules/nginx/files/ssl
diff --git a/tozt/nginx/manifests/config.pp b/modules/nginx/manifests/config.pp
index 8a95edd..8a95edd 100644
--- a/tozt/nginx/manifests/config.pp
+++ b/modules/nginx/manifests/config.pp
diff --git a/tozt/nginx/manifests/init.pp b/modules/nginx/manifests/init.pp
index 611be52..611be52 100644
--- a/tozt/nginx/manifests/init.pp
+++ b/modules/nginx/manifests/init.pp
diff --git a/tozt/nginx/manifests/install.pp b/modules/nginx/manifests/install.pp
index 680b0ab..680b0ab 100644
--- a/tozt/nginx/manifests/install.pp
+++ b/modules/nginx/manifests/install.pp
diff --git a/tozt/nginx/manifests/service.pp b/modules/nginx/manifests/service.pp
index f03364f..f03364f 100644
--- a/tozt/nginx/manifests/service.pp
+++ b/modules/nginx/manifests/service.pp
diff --git a/tozt/nginx/manifests/site.pp b/modules/nginx/manifests/site.pp
index 130a086..130a086 100644
--- a/tozt/nginx/manifests/site.pp
+++ b/modules/nginx/manifests/site.pp
diff --git a/tozt/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 89140c2..89140c2 100644
--- a/tozt/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
diff --git a/tozt/package/manifests/cargo.pp b/modules/package/manifests/cargo.pp
index 2f599b9..2f599b9 100644
--- a/tozt/package/manifests/cargo.pp
+++ b/modules/package/manifests/cargo.pp
diff --git a/tozt/package/manifests/makepkg.pp b/modules/package/manifests/makepkg.pp
index c9d0318..c9d0318 100644
--- a/tozt/package/manifests/makepkg.pp
+++ b/modules/package/manifests/makepkg.pp
diff --git a/tozt/rust/manifests/init.pp b/modules/rust/manifests/init.pp
index 37f74ac..37f74ac 100644
--- a/tozt/rust/manifests/init.pp
+++ b/modules/rust/manifests/init.pp
diff --git a/tozt/rust/manifests/user.pp b/modules/rust/manifests/user.pp
index 1b16eeb..1b16eeb 100644
--- a/tozt/rust/manifests/user.pp
+++ b/modules/rust/manifests/user.pp
diff --git a/tozt/secret/manifests/init.pp b/modules/secret/manifests/init.pp
index 054a71d..054a71d 100644
--- a/tozt/secret/manifests/init.pp
+++ b/modules/secret/manifests/init.pp
diff --git a/tozt/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index 8a38060..8a38060 100644
--- a/tozt/sudo/manifests/init.pp
+++ b/modules/sudo/manifests/init.pp
diff --git a/tozt/sudo/manifests/user.pp b/modules/sudo/manifests/user.pp
index 81fde70..81fde70 100644
--- a/tozt/sudo/manifests/user.pp
+++ b/modules/sudo/manifests/user.pp
diff --git a/tozt/systemd/manifests/init.pp b/modules/systemd/manifests/init.pp
index f6b992a..f6b992a 100644
--- a/tozt/systemd/manifests/init.pp
+++ b/modules/systemd/manifests/init.pp
diff --git a/tozt/tarsnap/files/acts b/modules/tarsnap/files/acts
index 7c2c3bd..7c2c3bd 100644
--- a/tozt/tarsnap/files/acts
+++ b/modules/tarsnap/files/acts
diff --git a/tozt/tarsnap/files/acts.conf b/modules/tarsnap/files/acts.conf
index 5228f54..5228f54 100644
--- a/tozt/tarsnap/files/acts.conf
+++ b/modules/tarsnap/files/acts.conf
diff --git a/tozt/tarsnap/files/tarsnap.conf b/modules/tarsnap/files/tarsnap.conf
index 42e2fb9..42e2fb9 100644
--- a/tozt/tarsnap/files/tarsnap.conf
+++ b/modules/tarsnap/files/tarsnap.conf
diff --git a/tozt/tarsnap/manifests/init.pp b/modules/tarsnap/manifests/init.pp
index c397164..c397164 100644
--- a/tozt/tarsnap/manifests/init.pp
+++ b/modules/tarsnap/manifests/init.pp
diff --git a/tozt/tozt/files/cgitrc b/modules/tozt/files/cgitrc
index e52e13b..e52e13b 100644
--- a/tozt/tozt/files/cgitrc
+++ b/modules/tozt/files/cgitrc
diff --git a/tozt/tozt/files/hosts b/modules/tozt/files/hosts
index 40a877c..40a877c 100644
--- a/tozt/tozt/files/hosts
+++ b/modules/tozt/files/hosts
diff --git a/tozt/tozt/files/hugo-tozt b/modules/tozt/files/hugo-tozt
index 859656b..859656b 100755
--- a/tozt/tozt/files/hugo-tozt
+++ b/modules/tozt/files/hugo-tozt
diff --git a/tozt/tozt/files/new-git-repo b/modules/tozt/files/new-git-repo
index 138fadb..138fadb 100755
--- a/tozt/tozt/files/new-git-repo
+++ b/modules/tozt/files/new-git-repo
diff --git a/tozt/tozt/files/nginx/blog-tls.conf b/modules/tozt/files/nginx/blog-tls.conf
index 094d5b7..094d5b7 100644
--- a/tozt/tozt/files/nginx/blog-tls.conf
+++ b/modules/tozt/files/nginx/blog-tls.conf
diff --git a/tozt/tozt/files/nginx/blog.conf b/modules/tozt/files/nginx/blog.conf
index cbb72df..cbb72df 100644
--- a/tozt/tozt/files/nginx/blog.conf
+++ b/modules/tozt/files/nginx/blog.conf
diff --git a/tozt/tozt/files/nginx/doy-tls.conf b/modules/tozt/files/nginx/doy-tls.conf
index e869a5c..e869a5c 100644
--- a/tozt/tozt/files/nginx/doy-tls.conf
+++ b/modules/tozt/files/nginx/doy-tls.conf
diff --git a/tozt/tozt/files/nginx/doy.conf b/modules/tozt/files/nginx/doy.conf
index 15c3932..15c3932 100644
--- a/tozt/tozt/files/nginx/doy.conf
+++ b/modules/tozt/files/nginx/doy.conf
diff --git a/tozt/tozt/files/nginx/git-tls.conf b/modules/tozt/files/nginx/git-tls.conf
index 6e0dfbb..6e0dfbb 100644
--- a/tozt/tozt/files/nginx/git-tls.conf
+++ b/modules/tozt/files/nginx/git-tls.conf
diff --git a/tozt/tozt/files/nginx/git.conf b/modules/tozt/files/nginx/git.conf
index cafdcc8..cafdcc8 100644
--- a/tozt/tozt/files/nginx/git.conf
+++ b/modules/tozt/files/nginx/git.conf
diff --git a/tozt/tozt/files/nginx/paste-tls.conf b/modules/tozt/files/nginx/paste-tls.conf
index b73d7a8..b73d7a8 100644
--- a/tozt/tozt/files/nginx/paste-tls.conf
+++ b/modules/tozt/files/nginx/paste-tls.conf
diff --git a/tozt/tozt/files/nginx/paste.conf b/modules/tozt/files/nginx/paste.conf
index 839fe78..839fe78 100644
--- a/tozt/tozt/files/nginx/paste.conf
+++ b/modules/tozt/files/nginx/paste.conf
diff --git a/tozt/tozt/files/nginx/ttrss-tls.conf b/modules/tozt/files/nginx/ttrss-tls.conf
index 10e4f3c..10e4f3c 100644
--- a/tozt/tozt/files/nginx/ttrss-tls.conf
+++ b/modules/tozt/files/nginx/ttrss-tls.conf
diff --git a/tozt/tozt/files/nginx/ttrss.conf b/modules/tozt/files/nginx/ttrss.conf
index 8680dcb..8680dcb 100644
--- a/tozt/tozt/files/nginx/ttrss.conf
+++ b/modules/tozt/files/nginx/ttrss.conf
diff --git a/tozt/tozt/files/post-receive b/modules/tozt/files/post-receive
index 2f26f7c..2f26f7c 100755
--- a/tozt/tozt/files/post-receive
+++ b/modules/tozt/files/post-receive
diff --git a/tozt/tozt/files/puppet-tozt b/modules/tozt/files/puppet-tozt
index 2ce71bd..4ea27ef 100644
--- a/tozt/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/tozt -e 'include tozt'
+sudo puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules -e 'include tozt'
diff --git a/tozt/tozt/manifests/backups.pp b/modules/tozt/manifests/backups.pp
index 2036777..2036777 100644
--- a/tozt/tozt/manifests/backups.pp
+++ b/modules/tozt/manifests/backups.pp
diff --git a/tozt/tozt/manifests/bootstrap.pp b/modules/tozt/manifests/bootstrap.pp
index 7d18444..7d18444 100644
--- a/tozt/tozt/manifests/bootstrap.pp
+++ b/modules/tozt/manifests/bootstrap.pp
diff --git a/tozt/tozt/manifests/certbot.pp b/modules/tozt/manifests/certbot.pp
index cad7d1a..cad7d1a 100644
--- a/tozt/tozt/manifests/certbot.pp
+++ b/modules/tozt/manifests/certbot.pp
diff --git a/tozt/tozt/manifests/git.pp b/modules/tozt/manifests/git.pp
index 03204dc..03204dc 100644
--- a/tozt/tozt/manifests/git.pp
+++ b/modules/tozt/manifests/git.pp
diff --git a/tozt/tozt/manifests/init.pp b/modules/tozt/manifests/init.pp
index f7997da..f7997da 100644
--- a/tozt/tozt/manifests/init.pp
+++ b/modules/tozt/manifests/init.pp
diff --git a/tozt/tozt/manifests/misc.pp b/modules/tozt/manifests/misc.pp
index a68bdd1..a68bdd1 100644
--- a/tozt/tozt/manifests/misc.pp
+++ b/modules/tozt/manifests/misc.pp
diff --git a/tozt/tozt/manifests/pass.pp b/modules/tozt/manifests/pass.pp
index b1241c1..b1241c1 100644
--- a/tozt/tozt/manifests/pass.pp
+++ b/modules/tozt/manifests/pass.pp
diff --git a/tozt/tozt/manifests/paste.pp b/modules/tozt/manifests/paste.pp
index 93d7939..93d7939 100644
--- a/tozt/tozt/manifests/paste.pp
+++ b/modules/tozt/manifests/paste.pp
diff --git a/tozt/tozt/manifests/persistent.pp b/modules/tozt/manifests/persistent.pp
index 0726455..0726455 100644
--- a/tozt/tozt/manifests/persistent.pp
+++ b/modules/tozt/manifests/persistent.pp
diff --git a/tozt/tozt/manifests/services.pp b/modules/tozt/manifests/services.pp
index 1789715..1789715 100644
--- a/tozt/tozt/manifests/services.pp
+++ b/modules/tozt/manifests/services.pp
diff --git a/tozt/tozt/manifests/site.pp b/modules/tozt/manifests/site.pp
index f28619a..f28619a 100644
--- a/tozt/tozt/manifests/site.pp
+++ b/modules/tozt/manifests/site.pp
diff --git a/tozt/tozt/manifests/tools.pp b/modules/tozt/manifests/tools.pp
index 5531460..5531460 100644
--- a/tozt/tozt/manifests/tools.pp
+++ b/modules/tozt/manifests/tools.pp
diff --git a/tozt/tozt/manifests/ttrss.pp b/modules/tozt/manifests/ttrss.pp
index 3b25ec3..3b25ec3 100644
--- a/tozt/tozt/manifests/ttrss.pp
+++ b/modules/tozt/manifests/ttrss.pp
diff --git a/tozt/tozt/manifests/user.pp b/modules/tozt/manifests/user.pp
index f82d716..f82d716 100644
--- a/tozt/tozt/manifests/user.pp
+++ b/modules/tozt/manifests/user.pp
diff --git a/tozt/tozt/manifests/users.pp b/modules/tozt/manifests/users.pp
index b07373b..b07373b 100644
--- a/tozt/tozt/manifests/users.pp
+++ b/modules/tozt/manifests/users.pp
diff --git a/tozt/tozt/manifests/vpn.pp b/modules/tozt/manifests/vpn.pp
index aa84f53..aa84f53 100644
--- a/tozt/tozt/manifests/vpn.pp
+++ b/modules/tozt/manifests/vpn.pp
diff --git a/tozt/ttrss/files/config.php b/modules/ttrss/files/config.php
index 5f1eb51..5f1eb51 100644
--- a/tozt/ttrss/files/config.php
+++ b/modules/ttrss/files/config.php
diff --git a/tozt/ttrss/files/pacman-hook b/modules/ttrss/files/pacman-hook
index f9cf938..f9cf938 100644
--- a/tozt/ttrss/files/pacman-hook
+++ b/modules/ttrss/files/pacman-hook
diff --git a/tozt/ttrss/manifests/init.pp b/modules/ttrss/manifests/init.pp
index e7c9d2f..e7c9d2f 100644
--- a/tozt/ttrss/manifests/init.pp
+++ b/modules/ttrss/manifests/init.pp
diff --git a/tozt/ttrss/templates/postgres-service b/modules/ttrss/templates/postgres-service
index aa63550..aa63550 100644
--- a/tozt/ttrss/templates/postgres-service
+++ b/modules/ttrss/templates/postgres-service
diff --git a/tozt/wireguard/manifests/init.pp b/modules/wireguard/manifests/init.pp
index 236a269..236a269 100644
--- a/tozt/wireguard/manifests/init.pp
+++ b/modules/wireguard/manifests/init.pp
diff --git a/tozt/yaourt/manifests/init.pp b/modules/yaourt/manifests/init.pp
index 871cac8..871cac8 100644
--- a/tozt/yaourt/manifests/init.pp
+++ b/modules/yaourt/manifests/init.pp
diff --git a/tozt/zsh/manifests/init.pp b/modules/zsh/manifests/init.pp
index e6f97aa..e6f97aa 100644
--- a/tozt/zsh/manifests/init.pp
+++ b/modules/zsh/manifests/init.pp