Skip to content

Commit

Permalink
remove dumb-init, req only for certain scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
binhex committed Jul 12, 2022
1 parent 1006071 commit ef0fb8a
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion run/nobody/checkdns.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# this script checks dns is operational, a file is created if
# dns is not operational and this is monitored and picked up
Expand Down
2 changes: 1 addition & 1 deletion run/nobody/checkextport.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# variable used below with bash indirect expansion
application_incoming_port="${APPLICATION}_port"
Expand Down
2 changes: 1 addition & 1 deletion run/nobody/checkiptables.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# this script reads in the contents of a temporary file which contains the current
# iptables chain policies to check that they are in place before proceeding onto
Expand Down
2 changes: 1 addition & 1 deletion run/nobody/checkvpnextip.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# check that app requires external ip
if [[ "${APPLICATION}" != "sabnzbd" ]] && [[ "${APPLICATION}" != "privoxy" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion run/nobody/checkvpnip.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

while [ ! -f /tmp/getvpnip ]
do
Expand Down
2 changes: 1 addition & 1 deletion run/nobody/checkvpnport.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# check that app requires port forwarding and vpn provider is pia
if [[ "${APPLICATION}" != "sabnzbd" ]] && [[ "${APPLICATION}" != "privoxy" ]] && [[ "${VPN_PROV}" == "pia" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion run/nobody/preruncheck.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# script to call multiple scripts in series to read in values written by script /root/prerunget.sh

Expand Down
2 changes: 1 addition & 1 deletion run/root/getvpnextip.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# define timeout periods
curl_connnect_timeout_secs=10
Expand Down
2 changes: 1 addition & 1 deletion run/root/getvpnip.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# function to check ip address is in valid format (used for local tunnel ip and external ip)
check_valid_ip() {
Expand Down
2 changes: 1 addition & 1 deletion run/root/getvpnport.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# check endpoint is port forward enabled (pia only)
function port_forward_status() {
Expand Down
2 changes: 1 addition & 1 deletion run/root/iptable.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# initialise arrays for incoming ports
incoming_ports_ext_array=()
Expand Down
2 changes: 1 addition & 1 deletion run/root/openvpn.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

function create_openvpn_cli() {

Expand Down
2 changes: 1 addition & 1 deletion run/root/openvpndown.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

if [[ "${VPN_PROV}" == "pia" ]]; then
if [ -f '/tmp/getvpnport.pid' ]; then
Expand Down
2 changes: 1 addition & 1 deletion run/root/openvpnup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# run scripts to get tunnel ip, check dns, get external ip, and get incoming port
# note needs to be run in background, otherwise it blocks openvpn
Expand Down
2 changes: 1 addition & 1 deletion run/root/prerunget.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# script to call multiple scripts in series to read and then write out values

Expand Down
2 changes: 1 addition & 1 deletion run/root/start.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# if vpn set to "no" then don't run openvpn
if [[ "${VPN_ENABLED}" == "no" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion run/root/wireguard.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

function pia_create_wireguard_keys() {

Expand Down
2 changes: 1 addition & 1 deletion run/root/wireguarddown.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

if [[ "${VPN_PROV}" == "pia" ]]; then
if [ -f '/tmp/getvpnport.pid' ]; then
Expand Down
2 changes: 1 addition & 1 deletion run/root/wireguardup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/bash
#!/bin/bash

# run scripts to get tunnel ip, check dns, get external ip, and get incoming port
# note do not background this script, otherwise you cannot kill the backgrounded
Expand Down

0 comments on commit ef0fb8a

Please sign in to comment.