allanger/container-openvpn
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Activity

Merge pull request #32 from omriiluz/master

Browse Source 
Disable default bash xtrace and fix but in variables
This commit is contained in:
Kyle Manna
2015-03-01 22:50:35 -08:00
parent 42d95bd77a 43ae3eb61d
commit 96ffed0984
7 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -39,6 +39,9 @@ Upstream links:
docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_getclient CLIENTNAME > CLIENTNAME.ovpn docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_getclient CLIENTNAME > CLIENTNAME.ovpn
* Create an environment variable with the name DEBUG and value of 1 to enable debug output (using "docker -e").
for example - docker run --volumes-from $OVPN_DATA -d -p 1194:1194/udp --privileged -e DEBUG=1 kylemanna/openvpn
## How Does It Work? ## How Does It Work?

6
bin/easyrsa_vars
View File

@@ -4,7 +4,11 @@
# Import/export EasyRSA default settings # Import/export EasyRSA default settings
# #
set -ex if [ "$DEBUG" == "1" ]; then
set -x
fi
set -e
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
echo "No command provided" echo "No command provided"

17
bin/ovpn_genconfig
View File

@@ -46,7 +46,11 @@ usage() {
echo " -m Set client MTU" echo " -m Set client MTU"
} }
set -ex if [ "$DEBUG" == "1" ]; then
set -x
fi
set -e
OVPN_ENV=$OPENVPN/ovpn_env.sh OVPN_ENV=$OPENVPN/ovpn_env.sh
OVPN_SERVER=192.168.255.0/24 OVPN_SERVER=192.168.255.0/24
@@ -54,7 +58,9 @@ OVPN_DEFROUTE=1
OVPN_NAT=0 OVPN_NAT=0
OVPN_DNS=1 OVPN_DNS=1
OVPN_ROUTES=() OVPN_ROUTES=()
TMP_ROUTES=()
OVPN_PUSH=() OVPN_PUSH=()
TMP_PUSH=()
# Import defaults if present # Import defaults if present
[ -r "$OVPN_ENV" ] && source "$OVPN_ENV" [ -r "$OVPN_ENV" ] && source "$OVPN_ENV"
@@ -63,7 +69,7 @@ OVPN_PUSH=()
while getopts ":r:s:du:cp:DNm:" opt; do while getopts ":r:s:du:cp:DNm:" opt; do
case $opt in case $opt in
r) r)
OVPN_ROUTES+=("$OPTARG") TMP_ROUTES+=("$OPTARG")
;; ;;
s) s)
OVPN_SERVER=$OPTARG OVPN_SERVER=$OPTARG
@@ -78,7 +84,7 @@ while getopts ":r:s:du:cp:DNm:" opt; do
OVPN_CLIENT_TO_CLIENT=1 OVPN_CLIENT_TO_CLIENT=1
;; ;;
p) p)
OVPN_PUSH+=("$OPTARG") TMP_PUSH+=("$OPTARG")
;; ;;
D) D)
OVPN_DNS=0 OVPN_DNS=0
@@ -104,6 +110,11 @@ while getopts ":r:s:du:cp:DNm:" opt; do
esac esac
done done
# if new routes were not defined with -r, use default
[ ${#TMP_ROUTES[@]} -gt 0 ] && OVPN_ROUTES=("${TMP_ROUTES[@]}")
# if new push directives were not defined with -p, use default
[ ${#TMP_PUSH[@]} -gt 0 ] && OVPN_PUSH=("${TMP_PUSH[@]}")
# Server name is in the form "udp://vpn.example.com:1194" # Server name is in the form "udp://vpn.example.com:1194"
if [[ "$OVPN_SERVER_URL" =~ ^((udp|tcp)://)?([0-9a-zA-Z\.\-]+)(:([0-9]+))?$ ]]; then if [[ "$OVPN_SERVER_URL" =~ ^((udp|tcp)://)?([0-9a-zA-Z\.\-]+)(:([0-9]+))?$ ]]; then

6
bin/ovpn_getclient
View File

@@ -4,7 +4,11 @@
# Get an OpenVPN client configuration file # Get an OpenVPN client configuration file
# #
set -ex if [ "$DEBUG" == "1" ]; then
set -x
fi
set -e
source "$OPENVPN/ovpn_env.sh" source "$OPENVPN/ovpn_env.sh"
cn=$1 cn=$1

6
bin/ovpn_initpki
View File

@@ -4,7 +4,11 @@
# Initialize the EasyRSA PKI # Initialize the EasyRSA PKI
# #
set -ex if [ "$DEBUG" == "1" ]; then
set -x
fi
set -e
source "$OPENVPN/ovpn_env.sh" source "$OPENVPN/ovpn_env.sh"

6
bin/ovpn_run
View File

@@ -4,7 +4,11 @@
# Run the OpenVPN server normally # Run the OpenVPN server normally
# #
set -ex if [ "$DEBUG" == "1" ]; then
set -x
fi
set -e
source "$OPENVPN/ovpn_env.sh" source "$OPENVPN/ovpn_env.sh"

5
bin/ovpn_status
View File

@@ -3,7 +3,10 @@
# #
# Get OpenVPN server status # Get OpenVPN server status
# #
if [ "$DEBUG" == "1" ]; then
set -x
fi
set -ex set -e
tail -F /tmp/openvpn-status.log tail -F /tmp/openvpn-status.log