diff --git a/install.sh b/install.sh index 5a2cf91..d104e18 100755 --- a/install.sh +++ b/install.sh @@ -33,6 +33,10 @@ cp usr/local/bin/pyarc-milter /usr/local/bin/ cp usr/local/bin/pyarc-gen /usr/local/bin/ chmod +x /usr/local/bin/pyarc-milter chmod +x /usr/local/bin/pyarc-gen +mkdir -p /var/log/pyarc +touch /var/log/pyarc/pyarc.log + + # Config-Template kopieren falls nicht vorhanden if [ ! -f /etc/pyarc/milter.conf ]; then @@ -45,6 +49,7 @@ chown -R postfix:postfix /etc/pyarc chown -R postfix:postfix /var/log/pyarc chmod 750 /etc/pyarc chmod 755 /var/log/pyarc +chmod 640 /var/log/pyarc/pyarc.log # 6. Systemd Service anpassen und erstellen echo "--> Erstelle Systemd-Service..." diff --git a/usr/local/bin/pyarc-gen b/usr/local/bin/pyarc-gen index 960659a..e17ecf7 100644 --- a/usr/local/bin/pyarc-gen +++ b/usr/local/bin/pyarc-gen @@ -3,6 +3,7 @@ import sys import os import configparser import argparse +from datetime import datetime from cryptography.hazmat.primitives.asymmetric import rsa from cryptography.hazmat.primitives import serialization @@ -28,7 +29,8 @@ def main(): print(f"\n[{domain}]\nselector = arc2026\nprivate_key_path = /etc/pyarc/certs/{domain}.private.key\n", file=sys.stderr) sys.exit(1) - selector = config.get(domain, "selector", fallback="arc2026") + current_year = datetime.now().strftime("%Y") + selector = config.get(domain, "selector", fallback=f"arc{current_year}") key_path = config.get(domain, "private_key_path") if os.path.exists(key_path):