diff --git a/README.md b/README.md index 5ff3035..5dc0542 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Note that debian also has an onion service package archive, so you may want to e deb tor://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian `lsb_release -cs` main ``` -Copy (and modify according to your needs) the site files in `var/www` to `/var/www`, `usr/local` to `/usr/local` and the configuration files in `etc` to `/etc` after installation has finished. Then restart some services: +Copy (and modify according to your needs) the site files in `var/www` to `/var/www` and the configuration files in `etc` to `/etc` after installation has finished. Then restart some services: ``` systemctl daemon-reload && systemctl restart bind9.service && systemctl restart tor@default.service ``` diff --git a/usr/local/etc/rspamd/local.d/actions.conf b/etc/rspamd/local.d/actions.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/actions.conf rename to etc/rspamd/local.d/actions.conf diff --git a/usr/local/etc/rspamd/local.d/antivirus.conf b/etc/rspamd/local.d/antivirus.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/antivirus.conf rename to etc/rspamd/local.d/antivirus.conf diff --git a/usr/local/etc/rspamd/local.d/arc.conf b/etc/rspamd/local.d/arc.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/arc.conf rename to etc/rspamd/local.d/arc.conf diff --git a/usr/local/etc/rspamd/local.d/classifier-bayes.conf b/etc/rspamd/local.d/classifier-bayes.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/classifier-bayes.conf rename to etc/rspamd/local.d/classifier-bayes.conf diff --git a/usr/local/etc/rspamd/local.d/dkim_signing.conf b/etc/rspamd/local.d/dkim_signing.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/dkim_signing.conf rename to etc/rspamd/local.d/dkim_signing.conf diff --git a/usr/local/etc/rspamd/local.d/greylist.conf b/etc/rspamd/local.d/greylist.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/greylist.conf rename to etc/rspamd/local.d/greylist.conf diff --git a/usr/local/etc/rspamd/local.d/groups.conf b/etc/rspamd/local.d/groups.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/groups.conf rename to etc/rspamd/local.d/groups.conf diff --git a/usr/local/etc/rspamd/local.d/logging.inc b/etc/rspamd/local.d/logging.inc similarity index 100% rename from usr/local/etc/rspamd/local.d/logging.inc rename to etc/rspamd/local.d/logging.inc diff --git a/usr/local/etc/rspamd/local.d/neural.conf b/etc/rspamd/local.d/neural.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/neural.conf rename to etc/rspamd/local.d/neural.conf diff --git a/usr/local/etc/rspamd/local.d/neural_group.conf b/etc/rspamd/local.d/neural_group.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/neural_group.conf rename to etc/rspamd/local.d/neural_group.conf diff --git a/usr/local/etc/rspamd/local.d/options.inc b/etc/rspamd/local.d/options.inc similarity index 100% rename from usr/local/etc/rspamd/local.d/options.inc rename to etc/rspamd/local.d/options.inc diff --git a/usr/local/etc/rspamd/local.d/phishing.conf b/etc/rspamd/local.d/phishing.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/phishing.conf rename to etc/rspamd/local.d/phishing.conf diff --git a/usr/local/etc/rspamd/local.d/ratelimit.conf b/etc/rspamd/local.d/ratelimit.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/ratelimit.conf rename to etc/rspamd/local.d/ratelimit.conf diff --git a/usr/local/etc/rspamd/local.d/redis.conf b/etc/rspamd/local.d/redis.conf similarity index 100% rename from usr/local/etc/rspamd/local.d/redis.conf rename to etc/rspamd/local.d/redis.conf diff --git a/usr/local/etc/rspamd/local.d/worker-fuzzy.inc b/etc/rspamd/local.d/worker-fuzzy.inc similarity index 100% rename from usr/local/etc/rspamd/local.d/worker-fuzzy.inc rename to etc/rspamd/local.d/worker-fuzzy.inc diff --git a/usr/local/etc/rspamd/override.d/fuzzy_check.conf b/etc/rspamd/override.d/fuzzy_check.conf similarity index 100% rename from usr/local/etc/rspamd/override.d/fuzzy_check.conf rename to etc/rspamd/override.d/fuzzy_check.conf diff --git a/usr/local/etc/rspamd/override.d/worker-controller.inc b/etc/rspamd/override.d/worker-controller.inc similarity index 100% rename from usr/local/etc/rspamd/override.d/worker-controller.inc rename to etc/rspamd/override.d/worker-controller.inc diff --git a/etc/systemd/system/rspamd.service b/etc/systemd/system/rspamd.service deleted file mode 100644 index 21f45b0..0000000 --- a/etc/systemd/system/rspamd.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=rapid spam filtering system -After=nss-lookup.target network-online.target -Documentation=https://rspamd.com/doc/ - -[Service] -LimitNOFILE=1048576 -NonBlocking=true -ExecStart=/usr/local/bin/rspamd -c /usr/local/etc/rspamd/rspamd.conf -f -ExecReload=/bin/kill -HUP $MAINPID -User=_rspamd -RuntimeDirectory=rspamd -RuntimeDirectoryMode=0755 -Restart=always - -[Install] -WantedBy=multi-user.target