Skip to content

rewrite pi-hole and pivpn scripts to use docker containers #2841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
szaimen wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

rewrite pi-hole and pivpn scripts to use docker containers #2841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions not-supported/firewall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,20 @@ then
fi

# Pi-hole
if pihole &>/dev/null
if is_docker_running && docker ps -a --format "{{.Names}}" | grep -q "^pihole$"
then
print_text_in_color "$ICyan" "Allow Pi-hole"
ufw allow 53/tcp comment 'Pi-hole TCP'
ufw allow 53/udp comment 'Pi-hole UDP'
ufw allow 8094/tcp comment 'Pi-hole Web'
fi

# PiVPN
if pivpn &>/dev/null
# WireGuard
if is_docker_running && docker ps -a --format "{{.Names}}" | grep -q "^wg-easy$"
then
print_text_in_color "$ICyan" "Allow PiVPN"
ufw allow 51820/udp comment 'PiVPN'
print_text_in_color "$ICyan" "Allow WireGuard"
ufw allow 51820/udp comment 'WireGuard VPN'
ufw allow 51822/tcp comment 'WireGuard Web'
fi

# Plex
Expand Down
12 changes: 6 additions & 6 deletions not-supported/not-supported_menu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ $CHECKLIST_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
"Monitor Link Shares" "(Monitors the creation of link shares)" OFF \
"Off-Shore Backup Wizard" "(Create an Off-Shore Backup script)" OFF \
"Pi-hole" "(Network wide ads- and tracker blocking)" OFF \
"PiVPN" "(Install a Wireguard VPN server with PiVPN)" OFF \
"PLEX Media Server" "(Multimedia server application)" OFF \
"Remotedesktop" "(Install a remotedesktop based on xrdp)" OFF \
"SMB-server" "(Create and manage a SMB-server on OS level)" OFF \
"System Restore" "(Restore the system partition from a backup)" OFF 3>&1 1>&2 2>&3)
"System Restore" "(Restore the system partition from a backup)" OFF \
"WireGuard" "(Install a WireGuard VPN server)" OFF 3>&1 1>&2 2>&3)

case "$choice" in
*"BTRFS Format"*)
Expand Down Expand Up @@ -102,10 +102,6 @@ case "$choice" in
print_text_in_color "$ICyan" "Downloading the Pi-hole script..."
run_script NOT_SUPPORTED_FOLDER pi-hole
;;&
*"PiVPN"*)
print_text_in_color "$ICyan" "Downloading the PiVPN script..."
run_script NOT_SUPPORTED_FOLDER pivpn
;;&
*"PLEX Media Server"*)
print_text_in_color "$ICyan" "Downloading the PLEX Media Server script..."
run_script NOT_SUPPORTED_FOLDER plexmediaserver
Expand All @@ -122,6 +118,10 @@ case "$choice" in
print_text_in_color "$ICyan" "Downloading the System Restore script..."
run_script NOT_SUPPORTED_FOLDER system-restore
;;&
*"WireGuard"*)
print_text_in_color "$ICyan" "Downloading the WireGuard script..."
run_script NOT_SUPPORTED_FOLDER wireguard
;;&
*)
;;
esac
Expand Down
Loading