summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/certbot/files/reload-cert2
-rw-r--r--modules/dkim/manifests/init.pp5
-rw-r--r--modules/dovecot/manifests/init.pp5
-rw-r--r--modules/postfix/manifests/init.pp5
-rw-r--r--modules/procmail/files/mark_as_read20
-rw-r--r--modules/procmail/files/procmailrc19
-rw-r--r--modules/procmail/manifests/init.pp19
-rw-r--r--modules/roundcubemail/files/roundcubemail.service10
-rw-r--r--modules/roundcubemail/manifests/init.pp25
-rw-r--r--modules/spamassassin/files/local.cf19
-rw-r--r--modules/spamassassin/files/spamassassin5
-rw-r--r--modules/spamassassin/manifests/init.pp17
-rw-r--r--modules/tarsnap/files/acts.conf2
-rw-r--r--modules/tozt/files/nginx/mail-tls.conf25
-rw-r--r--modules/tozt/files/nginx/mail.conf10
-rw-r--r--modules/tozt/manifests/init.pp2
-rw-r--r--modules/tozt/manifests/mail.pp11
-rw-r--r--modules/tozt/manifests/site.pp7
-rw-r--r--modules/tozt/manifests/vpn.pp3
-rw-r--r--modules/vpn/manifests/ca.pp5
-rw-r--r--modules/vpn/manifests/init.pp7
21 files changed, 1 insertions, 222 deletions
diff --git a/modules/certbot/files/reload-cert b/modules/certbot/files/reload-cert
index 859de51..9ca23e5 100644
--- a/modules/certbot/files/reload-cert
+++ b/modules/certbot/files/reload-cert
@@ -3,5 +3,3 @@ set -eu
set -o pipefail
systemctl restart nginx
-systemctl restart postfix
-systemctl restart dovecot
diff --git a/modules/dkim/manifests/init.pp b/modules/dkim/manifests/init.pp
deleted file mode 100644
index 5349f4f..0000000
--- a/modules/dkim/manifests/init.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class dkim {
- package { 'opendkim':
- ensure => installed;
- }
-}
diff --git a/modules/dovecot/manifests/init.pp b/modules/dovecot/manifests/init.pp
deleted file mode 100644
index 925604e..0000000
--- a/modules/dovecot/manifests/init.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class dovecot {
- package { 'dovecot':
- ensure => installed;
- }
-}
diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
deleted file mode 100644
index d8991eb..0000000
--- a/modules/postfix/manifests/init.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class postfix {
- package { 'postfix':
- ensure => installed;
- }
-}
diff --git a/modules/procmail/files/mark_as_read b/modules/procmail/files/mark_as_read
deleted file mode 100644
index 726c6f5..0000000
--- a/modules/procmail/files/mark_as_read
+++ /dev/null
@@ -1,20 +0,0 @@
-:0
-{
- :0c:
- $folder
-
- :0
- * LASTFOLDER ?? /\/[^/]+$
- { tail=$MATCH }
-
- file_read_base="${folder}cur/${tail}"
- file_new=$LASTFOLDER
- # pretty hackish, but what can you do
- file_cur="${file_read_base}*"
- file_read="${file_read_base}:2,S"
- TRAP="mv $file_new $file_read 2>/dev/null || mv $file_cur $file_read 2>/dev/null"
-
- HOST
-}
-
-# vim:ft=procmail
diff --git a/modules/procmail/files/procmailrc b/modules/procmail/files/procmailrc
deleted file mode 100644
index 7592c05..0000000
--- a/modules/procmail/files/procmailrc
+++ /dev/null
@@ -1,19 +0,0 @@
-DEFAULT=$HOME/Maildir/
-SPAM=${DEFAULT}.spam/
-MAILDIR=$HOME/Maildir/
-PMDIR=$HOME/.procmail
-LOGFILE=$PMDIR/log
-
-DROPPRIVS=yes
-
-:0fw: spamassassin.lock
-| /usr/bin/vendor_perl/spamassassin
-
-:0
-* ^X-Spam-Flag: YES
-{
- folder=$SPAM
- SWITCHRC=/etc/procmail/mark_as_read
-}
-
-# vim:ft=procmail
diff --git a/modules/procmail/manifests/init.pp b/modules/procmail/manifests/init.pp
deleted file mode 100644
index 6cb269c..0000000
--- a/modules/procmail/manifests/init.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class procmail {
- package { 'procmail':
- ensure => installed;
- }
-
- file {
- '/etc/procmail':
- ensure => directory;
- '/etc/procmail/mark_as_read':
- source => 'puppet:///modules/procmail/mark_as_read',
- require => File['/etc/procmail'];
- '/etc/procmailrc':
- source => 'puppet:///modules/procmail/procmailrc',
- require => [
- Class['spamassassin'],
- File['/etc/procmail/mark_as_read'],
- ];
- }
-}
diff --git a/modules/roundcubemail/files/roundcubemail.service b/modules/roundcubemail/files/roundcubemail.service
deleted file mode 100644
index 94a9bf6..0000000
--- a/modules/roundcubemail/files/roundcubemail.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=roundcubemail
-
-[Service]
-User=http
-Group=http
-ExecStart=/usr/bin/spawn-fcgi -a 127.0.0.1 -p 9000 -f /usr/bin/php-cgi -C 2 -n
-
-[Install]
-WantedBy=multi-user.target
diff --git a/modules/roundcubemail/manifests/init.pp b/modules/roundcubemail/manifests/init.pp
deleted file mode 100644
index 6b15e4a..0000000
--- a/modules/roundcubemail/manifests/init.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-class roundcubemail {
- include systemd
-
- package { ['roundcubemail', 'spawn-fcgi', 'php-cgi']:
- ensure => installed;
- }
-
- file { '/etc/systemd/system/roundcubemail.service':
- source => 'puppet:///modules/roundcubemail/roundcubemail.service',
- require => [
- Package['roundcubemail'],
- Package['spawn-fcgi'],
- ],
- notify => Exec['systemctl daemon-reload'];
- }
-
- service { 'roundcubemail':
- ensure => running,
- enable => true,
- require => [
- File['/etc/systemd/system/roundcubemail.service'],
- Exec['systemctl daemon-reload'],
- ];
- }
-}
diff --git a/modules/spamassassin/files/local.cf b/modules/spamassassin/files/local.cf
deleted file mode 100644
index be57ebf..0000000
--- a/modules/spamassassin/files/local.cf
+++ /dev/null
@@ -1,19 +0,0 @@
-report_safe 0
-lock_method flock
-required_score 3.5
-use_bayes 1
-bayes_auto_learn 0
-
-bayes_ignore_header X-Spam-Checker-Version
-bayes_ignore_header X-Spam-Level
-bayes_ignore_header X-Spam-Status
-
-loadplugin Mail::SpamAssassin::Plugin::Shortcircuit
-shortcircuit BAYES_99 spam
-shortcircuit BAYES_00 ham
-
-loadplugin Mail::SpamAssassin::Plugin::AWL
-header AWL eval:check_from_in_auto_whitelist()
-describe AWL From: address is in the auto white-list
-tflags AWL userconf noautolearn
-priority AWL 1000
diff --git a/modules/spamassassin/files/spamassassin b/modules/spamassassin/files/spamassassin
deleted file mode 100644
index 8b63b78..0000000
--- a/modules/spamassassin/files/spamassassin
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if /usr/bin/vendor_perl/sa-update --checkonly; then
- /usr/bin/vendor_perl/sa-update -v
-fi
diff --git a/modules/spamassassin/manifests/init.pp b/modules/spamassassin/manifests/init.pp
deleted file mode 100644
index 57a2291..0000000
--- a/modules/spamassassin/manifests/init.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class spamassassin {
- package { 'spamassassin':
- ensure => installed;
- }
-
- file {
- '/etc/mail/spamassassin/local.cf':
- source => 'puppet:///modules/spamassassin/local.cf';
- '/etc/cron.daily/spamassassin':
- source => 'puppet:///modules/spamassassin/spamassassin',
- mode => '0755',
- require => [
- Package['spamassassin'],
- Package['cronie'],
- ];
- }
-}
diff --git a/modules/tarsnap/files/acts.conf b/modules/tarsnap/files/acts.conf
index 6ab330f..5228f54 100644
--- a/modules/tarsnap/files/acts.conf
+++ b/modules/tarsnap/files/acts.conf
@@ -1,3 +1,3 @@
#!/bin/sh
-backuptargets="home/doy/Maildir home/doy/pass home/doy/paste home/doy/public_html home/doy/irclogs"
+backuptargets="home/doy/pass home/doy/paste home/doy/public_html home/doy/irclogs"
diff --git a/modules/tozt/files/nginx/mail-tls.conf b/modules/tozt/files/nginx/mail-tls.conf
deleted file mode 100644
index c96c749..0000000
--- a/modules/tozt/files/nginx/mail-tls.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-server {
- listen 443;
- server_name mail.tozt.net;
-
- access_log /var/log/nginx/mail.access.log;
- error_log /var/log/nginx/mail.error.log;
-
- include ssl;
- add_header Strict-Transport-Security max-age=15768000;
-
- location / {
- root /usr/share/webapps/roundcubemail;
- index index.php index.html index.htm;
- }
-
- location ~ \.php$ {
- root /usr/share/webapps/roundcubemail;
- fastcgi_pass 127.0.0.1:9000;
- fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME /usr/share/webapps/roundcubemail$fastcgi_script_name;
- fastcgi_param HTTPS on;
- include fastcgi_params;
- }
-}
-# vim:ft=nginx
diff --git a/modules/tozt/files/nginx/mail.conf b/modules/tozt/files/nginx/mail.conf
deleted file mode 100644
index 33842a7..0000000
--- a/modules/tozt/files/nginx/mail.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-server {
- listen 80;
- server_name mail.tozt.net;
-
- access_log /var/log/nginx/mail.access.log;
- error_log /var/log/nginx/mail.error.log;
-
- rewrite ^(.*) https://$host$1 permanent;
-}
-# vim:ft=nginx
diff --git a/modules/tozt/manifests/init.pp b/modules/tozt/manifests/init.pp
index 00a385b..770d7c0 100644
--- a/modules/tozt/manifests/init.pp
+++ b/modules/tozt/manifests/init.pp
@@ -3,8 +3,6 @@ class tozt {
include tozt::bootstrap
include tozt::irc
include tozt::backups
- include tozt::mail
include tozt::site
- include tozt::vpn
include tozt::other_packages
}
diff --git a/modules/tozt/manifests/mail.pp b/modules/tozt/manifests/mail.pp
deleted file mode 100644
index e5e3410..0000000
--- a/modules/tozt/manifests/mail.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class tozt::mail {
- include dovecot
- include postfix
- include spamassassin
- include procmail
- include dkim
-
- package { 'mutt':
- ensure => installed;
- }
-}
diff --git a/modules/tozt/manifests/site.pp b/modules/tozt/manifests/site.pp
index b6b43ff..b221978 100644
--- a/modules/tozt/manifests/site.pp
+++ b/modules/tozt/manifests/site.pp
@@ -1,6 +1,4 @@
class tozt::site {
- include roundcubemail
-
nginx::site {
"blog-tls":
source => 'puppet:///modules/tozt/nginx/blog-tls.conf',
@@ -12,11 +10,6 @@ class tozt::site {
enabled => false;
"doy":
source => 'puppet:///modules/tozt/nginx/doy.conf';
- "mail-tls":
- source => 'puppet:///modules/tozt/nginx/mail-tls.conf',
- enabled => false;
- "mail":
- source => 'puppet:///modules/tozt/nginx/mail.conf';
"paste-tls":
source => 'puppet:///modules/tozt/nginx/paste-tls.conf',
enabled => false;
diff --git a/modules/tozt/manifests/vpn.pp b/modules/tozt/manifests/vpn.pp
deleted file mode 100644
index cdd3930..0000000
--- a/modules/tozt/manifests/vpn.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class tozt::vpn {
- include vpn
-}
diff --git a/modules/vpn/manifests/ca.pp b/modules/vpn/manifests/ca.pp
deleted file mode 100644
index c6c3279..0000000
--- a/modules/vpn/manifests/ca.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class vpn::ca {
- package { 'easy-rsa':
- ensure => installed;
- }
-}
diff --git a/modules/vpn/manifests/init.pp b/modules/vpn/manifests/init.pp
deleted file mode 100644
index 0a1b772..0000000
--- a/modules/vpn/manifests/init.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class vpn {
- include vpn::ca;
-
- package { 'openvpn':
- ensure => installed;
- }
-}
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-02 08:21:24 +0000