T-Gander/ProxmoxVEDHelperScripts
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Fixes for review comments.

Browse Source
This commit is contained in:
Stephen Chin
2026-03-09 01:08:53 -07:00
committed by GitHub
parent f7efc94f34
commit 8aee8f0af7
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
install/protonmail-bridge-install.sh
View File

@@ -30,7 +30,6 @@ cat <<EOF> /etc/systemd/system/protonmail-bridge.service
Description=Proton Mail Bridge (noninteractive) Description=Proton Mail Bridge (noninteractive)
After=network-online.target After=network-online.target
Wants=network-online.target Wants=network-online.target
ConditionPathExists=/home/protonbridge/.protonmailbridge-initialized ConditionPathExists=/home/protonbridge/.protonmailbridge-initialized
[Service] [Service]
@@ -39,12 +38,9 @@ User=protonbridge
Group=protonbridge Group=protonbridge
WorkingDirectory=/home/protonbridge WorkingDirectory=/home/protonbridge
Environment=HOME=/home/protonbridge Environment=HOME=/home/protonbridge
ExecStart=/usr/bin/protonmail-bridge --noninteractive ExecStart=/usr/bin/protonmail-bridge --noninteractive
Restart=always Restart=always
RestartSec=3 RestartSec=3
NoNewPrivileges=yes NoNewPrivileges=yes
PrivateTmp=yes PrivateTmp=yes
ProtectSystem=full ProtectSystem=full
@@ -70,8 +66,6 @@ Service=protonmail-bridge-imap-proxy.service
[Install] [Install]
WantedBy=sockets.target WantedBy=sockets.target
EOF EOF
# IMAP proxy service (143 -> 127.0.0.1:1143)
cat <<'EOF'>/etc/systemd/system/protonmail-bridge-imap-proxy.service cat <<'EOF'>/etc/systemd/system/protonmail-bridge-imap-proxy.service
[Unit] [Unit]
Description=Proton Mail Bridge IMAP Proxy (143 -> 127.0.0.1:1143) Description=Proton Mail Bridge IMAP Proxy (143 -> 127.0.0.1:1143)
@@ -86,8 +80,6 @@ ExecStart=/usr/lib/systemd/systemd-socket-proxyd 127.0.0.1:1143
NoNewPrivileges=yes NoNewPrivileges=yes
PrivateTmp=yes PrivateTmp=yes
EOF EOF
# SMTP socket (LAN 587)
cat <<'EOF' > /etc/systemd/system/protonmail-bridge-smtp.socket cat <<'EOF' > /etc/systemd/system/protonmail-bridge-smtp.socket
[Unit] [Unit]
Description=Proton Mail Bridge SMTP Socket (587) Description=Proton Mail Bridge SMTP Socket (587)
@@ -101,8 +93,6 @@ Service=protonmail-bridge-smtp-proxy.service
[Install] [Install]
WantedBy=sockets.target WantedBy=sockets.target
EOF EOF
# SMTP proxy service (587 -> 127.0.0.1:1025)
cat <<'EOF'>/etc/systemd/system/protonmail-bridge-smtp-proxy.service cat <<'EOF'>/etc/systemd/system/protonmail-bridge-smtp-proxy.service
[Unit] [Unit]
Description=Proton Mail Bridge SMTP Proxy (587 -> 127.0.0.1:1025) Description=Proton Mail Bridge SMTP Proxy (587 -> 127.0.0.1:1025)
@@ -117,8 +107,6 @@ ExecStart=/usr/lib/systemd/systemd-socket-proxyd 127.0.0.1:1025
NoNewPrivileges=yes NoNewPrivileges=yes
PrivateTmp=yes PrivateTmp=yes
EOF EOF
systemctl daemon-reload
msg_ok "Created Services" msg_ok "Created Services"
msg_info "Creating Helper Commands" msg_info "Creating Helper Commands"
@@ -138,8 +126,8 @@ if [[ ! -f "${MARKER}" ]]; then
fi fi
# Stop sockets/proxies/bridge daemon before configuration # Stop sockets/proxies/bridge daemon before configuration
systemctl stop protonmail-bridge-imap.socket protonmail-bridge-smtp.socket 2>/dev/null || true systemctl stop protonmail-bridge-imap.socket protonmail-bridge-smtp.socket
systemctl stop protonmail-bridge-imap-proxy protonmail-bridge-smtp-proxy protonmail-bridge 2>/dev/null || true systemctl stop protonmail-bridge-imap-proxy protonmail-bridge-smtp-proxy protonmail-bridge
if [[ "${FIRST_TIME}" == "1" ]]; then if [[ "${FIRST_TIME}" == "1" ]]; then
echo "First-time setup: initializing pass keychain for ${BRIDGE_USER} (required by Proton Mail Bridge on Linux)." echo "First-time setup: initializing pass keychain for ${BRIDGE_USER} (required by Proton Mail Bridge on Linux)."
@@ -189,9 +177,7 @@ if [[ "${FIRST_TIME}" == "1" ]]; then
chmod 0644 "${MARKER}" chmod 0644 "${MARKER}"
fi fi
systemctl daemon-reload systemctl enable -q --now protonmail-bridge.service protonmail-bridge-imap.socket protonmail-bridge-smtp.socket
systemctl enable -q --now protonmail-bridge.service
systemctl enable -q --now protonmail-bridge-imap.socket protonmail-bridge-smtp.socket
if [[ "${FIRST_TIME}" == "1" ]]; then if [[ "${FIRST_TIME}" == "1" ]]; then
echo "Initialization complete. Services enabled and started." echo "Initialization complete. Services enabled and started."
@@ -201,7 +187,6 @@ fi
EOF EOF
chmod +x /usr/local/bin/protonmailbridge-configure chmod +x /usr/local/bin/protonmailbridge-configure
ln -sf /usr/local/bin/protonmailbridge-configure /usr/bin/protonmailbridge-configure ln -sf /usr/local/bin/protonmailbridge-configure /usr/bin/protonmailbridge-configure
msg_ok "Created Helper Commands" msg_ok "Created Helper Commands"
motd_ssh motd_ssh