diff --git a/scripts/prepare-package.sh b/scripts/prepare-package.sh index 5e61421..d89c8c6 100755 --- a/scripts/prepare-package.sh +++ b/scripts/prepare-package.sh @@ -34,9 +34,9 @@ WorkingDirectory=/var/lib/rustproxy UMask=0077 Environment=RUST_LOG=rust_proxy=info,warn Environment=MALLOC_ARENA_MAX=2 -Environment=PATH=/opt/rustproxy-certbot/bin:/usr/local/bin:/usr/bin:/bin +Environment=PATH=/usr/local/bin:/usr/bin:/bin EnvironmentFile=-/etc/rustproxy/environment -ExecStart=/usr/bin/$BINARY_NAME --data-dir /var/lib/rustproxy --admin-listen 0.0.0.0:9090 serve --proxy-listen 0.0.0.0:80 --tls-listen 0.0.0.0:443 --allow-remote-admin +ExecStart=/usr/bin/$BINARY_NAME --data-dir /var/lib/rustproxy --admin-listen 0.0.0.0:9090 --proxy-listen 0.0.0.0:80 --tls-listen 0.0.0.0:443 --allow-remote-admin serve Restart=on-failure RestartSec=3 KillSignal=SIGINT @@ -49,7 +49,7 @@ PrivateTmp=true PrivateDevices=true ProtectSystem=strict LogsDirectory=rustproxy -LogsDirectoryMode=0770 +LogsDirectoryMode=0700 ReadWritePaths=/var/lib/rustproxy /var/log/rustproxy ProtectHome=true ProtectKernelTunables=true @@ -139,7 +139,7 @@ fi if ! getent passwd "$PACKAGE_NAME" >/dev/null 2>&1; then useradd --system --gid "$PACKAGE_NAME" --home-dir "/var/lib/$PACKAGE_NAME" --no-create-home --shell /sbin/nologin "$PACKAGE_NAME" fi -install -d -o "$PACKAGE_NAME" -g "$PACKAGE_NAME" -m 0750 "/var/lib/$PACKAGE_NAME" "/var/log/$PACKAGE_NAME" +install -d -o "$PACKAGE_NAME" -g "$PACKAGE_NAME" -m 0700 "/var/lib/$PACKAGE_NAME" "/var/log/$PACKAGE_NAME" systemd-tmpfiles --create "/usr/lib/tmpfiles.d/${PACKAGE_NAME}.conf" >/dev/null 2>&1 || true systemctl daemon-reload >/dev/null 2>&1 || true systemctl enable "${PACKAGE_NAME}.service" >/dev/null 2>&1 || true