Skip to content

Commit 4825095

Browse files
committed
Implemented NO_CHOWN
1 parent 05de90e commit 4825095

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- Moved `tmp-dir` to server related config.
77
- Fixed bug in dockumentation (GUID -> PGID).
88
- Added `SKIP_APP` parameter (to skip app startup).
9+
- Added `NO_CHOWN` parameter (don't fix config files permissions).
910

1011
### 2.0.3 - Improved IPv6 support & finalized client mode support
1112

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ services:
6868
|:-----------:|:----------:|
6969
|`-e FAIL_MODE=hard`|Restart whole container on error|
7070
|`-e MODE=client`|Set docker mode (valid values: *empty*,server,client; default: server), set to client in case you use container as client|
71+
|`-e NO_CHOWN=true`|Disable permission fixing.|
7172
|`-e PUID=1000`|for UserID - see below for explanation|
7273
|`-e PGID=1000`|for GroupID - see below for explanation|
7374
|`-e PERSISTENT_INTERFACE=true`|Enable persistent TUN interface|

root/etc/cont-init.d/50-setup.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Setup backup
88
if [ ! -e "/config/backup" ]; then
99
mkdir /config/backup
10-
chown abc:abc /config/backup
10+
[ -n "$NO_CHOWN" ] || chown abc:abc /config/backup
1111
fi
1212

1313
#
@@ -17,7 +17,7 @@ fi
1717
if [ ! -d "/config/openvpn" ]; then
1818
echo "Creating /config/openvpn"
1919
mkdir -p /config/openvpn
20-
chown abc:abc /config/openvpn
20+
[ -n "$NO_CHOWN" ] || chown abc:abc /config/openvpn
2121
fi
2222

2323
# Check directories inside openvpn directory
@@ -27,7 +27,7 @@ do
2727
if [ ! -d "/config/openvpn/$h" ]; then
2828
echo "Creating /config/openvpn/$h"
2929
mkdir /config/openvpn/$h
30-
chown abc:abc /config/openvpn/$h
30+
[ -n "$NO_CHOWN" ] || chown abc:abc /config/openvpn/$h
3131
fi
3232
done
3333

@@ -49,7 +49,7 @@ for h in "${HOOKS_DIR[@]}"; do
4949
if [ ! -d "/config/openvpn/hooks/$h" ]; then
5050
echo "Creating /config/openvpn/hooks/$h"
5151
mkdir /config/openvpn/hooks/$h
52-
chown abc:abc /config/openvpn/hooks/$h
52+
[ -n "$NO_CHOWN" ] || chown abc:abc /config/openvpn/hooks/$h
5353
fi
5454
done
5555

@@ -67,17 +67,17 @@ fi
6767
if [ ! -d "/config/ssl" ]; then
6868
echo "Setting up /config/ssl"
6969
mkdir -p /config/ssl
70-
chown abc:abc /config/ssl
70+
[ -n "$NO_CHOWN" ] || chown abc:abc /config/ssl
7171
fi
7272

7373
if [ ! -e "$EASYRSA_VARS_FILE" ]; then
7474
#cp -R -u $EASYRSA/openssl-easyrsa.cnf $EASYRSA_SSL_CONF
7575
cp -R -u $EASYRSA/vars.example $EASYRSA_VARS_FILE
76-
chown abc:abc $EASYRSA_VARS_FILE
76+
[ -n "$NO_CHOWN" ] || chown abc:abc $EASYRSA_VARS_FILE
7777
fi
7878

7979
# Setup tmp
8080
if [ ! -e "/config/tmp" ]; then
8181
mkdir /config/tmp
82-
chown abc:abc /config/tmp
82+
[ -n "$NO_CHOWN" ] || chown abc:abc /config/tmp
8383
fi

root/etc/cont-init.d/70-config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ do
4141
done
4242
echo "" >> $DYNAMIC_FILE
4343

44-
chown $CONTAINER_USER:$CONTAINER_USER $DYNAMIC_FILE
44+
[ -n "$NO_CHOWN" ] || chown $CONTAINER_USER:$CONTAINER_USER $DYNAMIC_FILE

root/usr/local/bin/ovpn_backup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ ARCHIVE_NAME="/config/backup/ovpn_backup_$(date +%Y%m%d%H%M%S).tar.gz"
1111

1212
cd /config && tar cfvz $ARCHIVE_NAME ${BACKUP_DIRS[@]}
1313
if [ "$USER" != "abc" ]; then
14-
chown abc:abc $ARCHIVE_NAME # Fix backup archive permissions
14+
[ -n "$NO_CHOWN" ] || chown abc:abc $ARCHIVE_NAME # Fix backup archive permissions
1515
fi

root/usr/local/bin/ovpn_client

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function build_ovpn() {
9393
echo "</secret>" >> $OVPN_FILE
9494
fi
9595

96-
chown abc:abc $OVPN_FILE
96+
[ -n "$NO_CHOWN" ] || chown abc:abc $OVPN_FILE
9797

9898
if [ $# -gt 1 ] && [ "$2" == "print" ]; then
9999
cat $OVPN_FILE

0 commit comments

Comments
 (0)