GitHub-Bitwarden
/
server
mirror of https://github.com/bitwarden/server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Revert "Use user primary group if not root (#292)" 

This reverts commit ec89c36ca0.
pull/300/head
Kyle Spearrin 8 years ago
parent
ec89c36ca0
commit
0f675d8ccb
11 changed files with 377 additions and 148 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      scripts/install.sh
  2. 65
      scripts/run.sh
  3. 53
      src/Admin/entrypoint.sh
  4. 56
      src/Api/entrypoint.sh
  5. 54
      src/Icons/entrypoint.sh
  6. 53
      src/Identity/entrypoint.sh
  7. 53
      util/Attachments/entrypoint.sh
  8. 56
      util/MsSql/entrypoint.sh
  9. 53
      util/Nginx/entrypoint.sh
  10. 5
      util/Setup/EnvironmentFileBuilder.cs
  11. 51
      util/Setup/entrypoint.sh

26
scripts/install.sh
Unescape View File

@ -4,11 +4,10 @@ set -e @@ -4,11 +4,10 @@ set -e
CYAN='\033[0;36m'
NC='\033[0m' # No Color
OUTPUT_DIR=".."
OUTPUT_DIR="../."
if [ $# -gt 0 ]
then
OUTPUT_DIR=$1
mkdir -p $OUTPUT_DIR
fi
COREVERSION="latest"
@ -23,13 +22,16 @@ then @@ -23,13 +22,16 @@ then
WEBVERSION=$3
fi
ENV_DIR="$OUTPUT_DIR/env"
OS="lin"
if [ "$(uname)" == "Darwin" ]
then
OS="mac"
fi
# Save the installation UID/GID, they could also be manually changed later on if desired
LUID="LOCAL_UID=`id -u $USER`"
LGID="LOCAL_GID=`id -g $USER`"
mkdir -p $ENV_DIR
(echo $LUID; echo $LGID) > $ENV_DIR/uid.env
LGID="LOCAL_GID=`getent group docker | cut -d: -f3`"
mkdir -p $OUTPUT_DIR
LETS_ENCRYPT="n"
echo -e -n "${CYAN}(!)${NC} Enter the domain name for your bitwarden instance (ex. bitwarden.company.com): "
@ -62,8 +64,14 @@ then @@ -62,8 +64,14 @@ then
fi
docker pull bitwarden/setup:$COREVERSION
docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden --env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \
dotnet Setup.dll -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS -corev $COREVERSION -webv $WEBVERSION
if [ $OS == "lin" ]
then
docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden -e $LUID -e $LGID bitwarden/setup:$COREVERSION \
dotnet Setup.dll -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS -corev $COREVERSION -webv $WEBVERSION
else
docker run -it --rm --name setup -v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \
dotnet Setup.dll -install 1 -domain $DOMAIN -letsencrypt $LETS_ENCRYPT -os $OS -corev $COREVERSION -webv $WEBVERSION
fi
echo ""
echo "Setup complete"

65
scripts/run.sh
Unescape View File

@ -5,7 +5,7 @@ set -e @@ -5,7 +5,7 @@ set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
OUTPUT_DIR=".."
OUTPUT_DIR="../."
if [ $# -gt 1 ]
then
OUTPUT_DIR=$2
@ -23,18 +23,17 @@ then @@ -23,18 +23,17 @@ then
WEBVERSION=$4
fi
ENV_DIR="$OUTPUT_DIR/env"
DOCKER_DIR="$OUTPUT_DIR/docker"
# As in install.sh, save the running UID/GID, they could not exist yet, during an update for example
if ! grep -q "^LOCAL_UID=" $ENV_DIR/uid.env 2>/dev/null || ! grep -q "^LOCAL_GID=" $ENV_DIR/uid.env 2>/dev/null
OS="lin"
if [ "$(uname)" == "Darwin" ]
then
LUID="LOCAL_UID=`id -u $USER`"
LGID="LOCAL_GID=`id -g $USER`"
mkdir -p $ENV_DIR
(echo $LUID; echo $LGID) > $ENV_DIR/uid.env
OS="mac"
fi
DOCKER_DIR="$OUTPUT_DIR/docker"
ENV_DIR="$OUTPUT_DIR/env"
LUID="LOCAL_UID=`id -u $USER`"
LGID="LOCAL_GID=`getent group docker | cut -d: -f3`"
# Functions
function dockerComposeUp() {
@ -80,30 +79,58 @@ function updateLetsEncrypt() { @@ -80,30 +79,58 @@ function updateLetsEncrypt() {
function updateDatabase() {
pullSetup
docker run -i --rm --name setup --network container:bitwarden-mssql \
-v $OUTPUT_DIR:/bitwarden --env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
if [ $OS == "lin" ]
then
docker run -i --rm --name setup --network container:bitwarden-mssql \
-v $OUTPUT_DIR:/bitwarden -e $LUID -e $LGID bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
else
docker run -i --rm --name setup --network container:bitwarden-mssql \
-v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -db 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
fi
echo "Database update complete"
}
function update() {
pullSetup
docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \
--env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
if [ $OS == "lin" ]
then
docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \
-e $LUID -e $LGID bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
else
docker run -i --rm --name setup \
-v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \
dotnet Setup.dll -update 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
fi
}
function printEnvironment() {
pullSetup
docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \
--env-file $ENV_DIR/uid.env bitwarden/setup:$COREVERSION \
dotnet Setup.dll -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
if [ $OS == "lin" ]
then
docker run -i --rm --name setup -v $OUTPUT_DIR:/bitwarden \
-e $LUID -e $LGID bitwarden/setup:$COREVERSION \
dotnet Setup.dll -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
else
docker run -i --rm --name setup \
-v $OUTPUT_DIR:/bitwarden bitwarden/setup:$COREVERSION \
dotnet Setup.dll -printenv 1 -os $OS -corev $COREVERSION -webv $WEBVERSION
fi
}
function restart() {
dockerComposeDown
dockerComposePull
updateLetsEncrypt
if [ $OS == "lin" ]
then
mkdir -p $ENV_DIR
(echo $LUID; echo $LGID) > $ENV_DIR/uid.env
fi
dockerComposeUp
dockerPrune
printEnvironment

53
src/Admin/entrypoint.sh
Unescape View File

@ -5,27 +5,52 @@ @@ -5,27 +5,52 @@
GROUPNAME="bitwarden"
USERNAME="bitwarden"
LUID=${LOCAL_UID:-0}
LGID=${LOCAL_GID:-0}
CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user
NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ]
# Step down from host root
if [ $LGID == 0 ]
then
LUID=65534
LGID=999
fi
if [ $LGID -eq 0 ]
if [ $LUID == 0 ]
then
LGID=65534
LUID=999
fi
# Create user and group
# Create group
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
mkhomedir_helper $USERNAME
if [ $CURRENTGID ]
then
if [ "$CURRENTGID" != "$LGID" ]
then
groupmod -g $LGID $GROUPNAME
fi
else
groupadd -g $LGID $GROUPNAME
fi
# Create user and assign group
if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
then
usermod -u $LUID $USERNAME
elif [ $NOUSER == 1 ]
then
useradd -r -u $LUID -g $GROUPNAME $USERNAME
fi
# Make home directory for user
if [ ! -d "/home/$USERNAME" ]
then
mkhomedir_helper $USERNAME
fi
# The rest...
@ -38,4 +63,4 @@ chown -R $USERNAME:$GROUPNAME /etc/bitwarden @@ -38,4 +63,4 @@ chown -R $USERNAME:$GROUPNAME /etc/bitwarden
cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \
&& update-ca-certificates
exec gosu $USERNAME:$GROUPNAME dotnet /app/Admin.dll
gosu $USERNAME:$GROUPNAME dotnet /app/Admin.dll

56
src/Api/entrypoint.sh
Unescape View File

@ -5,27 +5,52 @@ @@ -5,27 +5,52 @@
GROUPNAME="bitwarden"
USERNAME="bitwarden"
LUID=${LOCAL_UID:-0}
LGID=${LOCAL_GID:-0}
CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user
NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ]
# Step down from host root
if [ $LGID == 0 ]
then
LUID=65534
LGID=999
fi
if [ $LGID -eq 0 ]
if [ $LUID == 0 ]
then
LGID=65534
LUID=999
fi
# Create user and group
# Create group
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
mkhomedir_helper $USERNAME
if [ $CURRENTGID ]
then
if [ "$CURRENTGID" != "$LGID" ]
then
groupmod -g $LGID $GROUPNAME
fi
else
groupadd -g $LGID $GROUPNAME
fi
# Create user and assign group
if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
then
usermod -u $LUID $USERNAME
elif [ $NOUSER == 1 ]
then
useradd -r -u $LUID -g $GROUPNAME $USERNAME
fi
# Make home directory for user
if [ ! -d "/home/$USERNAME" ]
then
mkhomedir_helper $USERNAME
fi
# The rest...
@ -38,11 +63,10 @@ mkdir -p /etc/bitwarden/logs @@ -38,11 +63,10 @@ mkdir -p /etc/bitwarden/logs
mkdir -p /etc/bitwarden/ca-certificates
chown -R $USERNAME:$GROUPNAME /etc/bitwarden
# Sounds like gosu keeps env when switching, but of course cron does not
env > /etc/environment
env >> /etc/environment
cron
cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \
&& update-ca-certificates
exec gosu $USERNAME:$GROUPNAME dotnet /app/Api.dll
gosu $USERNAME:$GROUPNAME dotnet /app/Api.dll

54
src/Icons/entrypoint.sh
Unescape View File

@ -5,30 +5,54 @@ @@ -5,30 +5,54 @@
GROUPNAME="bitwarden"
USERNAME="bitwarden"
LUID=${LOCAL_UID:-0}
LGID=${LOCAL_GID:-0}
CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user
NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ]
# Step down from host root
if [ $LGID == 0 ]
then
LGID=999
fi
if [ $LUID == 0 ]
then
LUID=999
fi
# Create group
if [ $CURRENTGID ]
then
LUID=65534
if [ "$CURRENTGID" != "$LGID" ]
then
groupmod -g $LGID $GROUPNAME
fi
else
groupadd -g $LGID $GROUPNAME
fi
if [ $LGID -eq 0 ]
# Create user and assign group
if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
then
usermod -u $LUID $USERNAME
elif [ $NOUSER == 1 ]
then
LGID=65534
useradd -r -u $LUID -g $GROUPNAME $USERNAME
fi
# Create user and group
# Make home directory for user
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
mkhomedir_helper $USERNAME
if [ ! -d "/home/$USERNAME" ]
then
mkhomedir_helper $USERNAME
fi
# The rest...
chown -R $USERNAME:$GROUPNAME /app
exec gosu $USERNAME:$GROUPNAME dotnet /app/Icons.dll
gosu $USERNAME:$GROUPNAME dotnet /app/Icons.dll

53
src/Identity/entrypoint.sh
Unescape View File

@ -5,27 +5,52 @@ @@ -5,27 +5,52 @@
GROUPNAME="bitwarden"
USERNAME="bitwarden"
LUID=${LOCAL_UID:-0}
LGID=${LOCAL_GID:-0}
CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user
NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ]
# Step down from host root
if [ $LGID == 0 ]
then
LUID=65534
LGID=999
fi
if [ $LGID -eq 0 ]
if [ $LUID == 0 ]
then
LGID=65534
LUID=999
fi
# Create user and group
# Create group
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
mkhomedir_helper $USERNAME
if [ $CURRENTGID ]
then
if [ "$CURRENTGID" != "$LGID" ]
then
groupmod -g $LGID $GROUPNAME
fi
else
groupadd -g $LGID $GROUPNAME
fi
# Create user and assign group
if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
then
usermod -u $LUID $USERNAME
elif [ $NOUSER == 1 ]
then
useradd -r -u $LUID -g $GROUPNAME $USERNAME
fi
# Make home directory for user
if [ ! -d "/home/$USERNAME" ]
then
mkhomedir_helper $USERNAME
fi
# The rest...
@ -41,4 +66,4 @@ chown -R $USERNAME:$GROUPNAME /app @@ -41,4 +66,4 @@ chown -R $USERNAME:$GROUPNAME /app
cp /etc/bitwarden/ca-certificates/*.crt /usr/local/share/ca-certificates/ \
&& update-ca-certificates
exec gosu $USERNAME:$GROUPNAME dotnet /app/Identity.dll
gosu $USERNAME:$GROUPNAME dotnet /app/Identity.dll

53
util/Attachments/entrypoint.sh
Unescape View File

@ -5,27 +5,52 @@ @@ -5,27 +5,52 @@
GROUPNAME="bitwarden"
USERNAME="bitwarden"
LUID=${LOCAL_UID:-0}
LGID=${LOCAL_GID:-0}
CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user
NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ]
# Step down from host root
if [ $LGID == 0 ]
then
LUID=65534
LGID=999
fi
if [ $LGID -eq 0 ]
if [ $LUID == 0 ]
then
LGID=65534
LUID=999
fi
# Create user and group
# Create group
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
mkhomedir_helper $USERNAME
if [ $CURRENTGID ]
then
if [ "$CURRENTGID" != "$LGID" ]
then
groupmod -g $LGID $GROUPNAME
fi
else
groupadd -g $LGID $GROUPNAME
fi
# Create user and assign group
if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
then
usermod -u $LUID $USERNAME
elif [ $NOUSER == 1 ]
then
useradd -r -u $LUID -g $GROUPNAME $USERNAME
fi
# Make home directory for user
if [ ! -d "/home/$USERNAME" ]
then
mkhomedir_helper $USERNAME
fi
# The rest...
@ -33,5 +58,5 @@ chown -R $USERNAME:$GROUPNAME /bitwarden_server @@ -33,5 +58,5 @@ chown -R $USERNAME:$GROUPNAME /bitwarden_server
mkdir -p /etc/bitwarden/core/attachments
chown -R $USERNAME:$GROUPNAME /etc/bitwarden
exec gosu $USERNAME:$GROUPNAME dotnet /bitwarden_server/Server.dll \
gosu $USERNAME:$GROUPNAME dotnet /bitwarden_server/Server.dll \
/contentRoot=/etc/bitwarden/core/attachments /webRoot=. /serveUnknown=true

56
util/MsSql/entrypoint.sh
Unescape View File

@ -5,27 +5,52 @@ @@ -5,27 +5,52 @@
GROUPNAME="bitwarden"
USERNAME="bitwarden"
LUID=${LOCAL_UID:-0}
LGID=${LOCAL_GID:-0}
CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user
NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ]
# Step down from host root
if [ $LGID == 0 ]
then
LUID=65534
LGID=999
fi
if [ $LGID -eq 0 ]
if [ $LUID == 0 ]
then
LGID=65534
LUID=999
fi
# Create user and group
# Create group
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
mkhomedir_helper $USERNAME
if [ $CURRENTGID ]
then
if [ "$CURRENTGID" != "$LGID" ]
then
groupmod -g $LGID $GROUPNAME
fi
else
groupadd -g $LGID $GROUPNAME
fi
# Create user and assign group
if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
then
usermod -u $LUID $USERNAME
elif [ $NOUSER == 1 ]
then
useradd -r -u $LUID -g $GROUPNAME $USERNAME
fi
# Make home directory for user
if [ ! -d "/home/$USERNAME" ]
then
mkhomedir_helper $USERNAME
fi
# The rest...
@ -38,8 +63,7 @@ chown -R $USERNAME:$GROUPNAME /var/opt/mssql @@ -38,8 +63,7 @@ chown -R $USERNAME:$GROUPNAME /var/opt/mssql
chown $USERNAME:$GROUPNAME /backup-db.sh
chown $USERNAME:$GROUPNAME /backup-db.sql
# Sounds like gosu keeps env when switching, but of course cron does not
env > /etc/environment
env >> /etc/environment
cron
exec gosu $USERNAME:$GROUPNAME /opt/mssql/bin/sqlservr
gosu $USERNAME:$GROUPNAME /opt/mssql/bin/sqlservr

53
util/Nginx/entrypoint.sh
Unescape View File

@ -5,27 +5,52 @@ @@ -5,27 +5,52 @@
GROUPNAME="bitwarden"
USERNAME="bitwarden"
LUID=${LOCAL_UID:-0}
LGID=${LOCAL_GID:-0}
CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user
NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ]
# Step down from host root
if [ $LGID == 0 ]
then
LUID=65534
LGID=999
fi
if [ $LGID -eq 0 ]
if [ $LUID == 0 ]
then
LGID=65534
LUID=999
fi
# Create user and group
# Create group
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
mkhomedir_helper $USERNAME
if [ $CURRENTGID ]
then
if [ "$CURRENTGID" != "$LGID" ]
then
groupmod -g $LGID $GROUPNAME
fi
else
groupadd -g $LGID $GROUPNAME
fi
# Create user and assign group
if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
then
usermod -u $LUID $USERNAME
elif [ $NOUSER == 1 ]
then
useradd -r -u $LUID -g $GROUPNAME $USERNAME
fi
# Make home directory for user
if [ ! -d "/home/$USERNAME" ]
then
mkhomedir_helper $USERNAME
fi
# The rest...
@ -40,4 +65,4 @@ chown -R $USERNAME:$GROUPNAME /var/run/nginx.pid @@ -40,4 +65,4 @@ chown -R $USERNAME:$GROUPNAME /var/run/nginx.pid
chown -R $USERNAME:$GROUPNAME /var/cache/nginx
chown -R $USERNAME:$GROUPNAME /var/log/nginx
exec gosu $USERNAME:$GROUPNAME nginx -g 'daemon off;'
gosu $USERNAME:$GROUPNAME nginx -g 'daemon off;'

5
util/Setup/EnvironmentFileBuilder.cs
Unescape View File

@ -172,10 +172,7 @@ SA_PASSWORD=SECRET @@ -172,10 +172,7 @@ SA_PASSWORD=SECRET
Helpers.Exec("chmod 600 /bitwarden/env/mssql.override.env");
// Empty uid env file. Only used on Linux hosts.
if(!File.Exists("/bitwarden/env/uid.env"))
{
using(var sw = File.CreateText("/bitwarden/env/uid.env")) { }
}
using(var sw = File.CreateText("/bitwarden/env/uid.env")) { }
}
}
}

51
util/Setup/entrypoint.sh
Unescape View File

@ -5,27 +5,52 @@ @@ -5,27 +5,52 @@
GROUPNAME="bitwarden"
USERNAME="bitwarden"
LUID=${LOCAL_UID:-0}
LGID=${LOCAL_GID:-0}
CURRENTGID=`getent group $GROUPNAME | cut -d: -f3`
LGID=${LOCAL_GID:-999}
# Step down from host root to well-known nobody/nogroup user
NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
LUID=${LOCAL_UID:-999}
if [ $LUID -eq 0 ]
# Step down from host root
if [ $LGID == 0 ]
then
LUID=65534
LGID=999
fi
if [ $LGID -eq 0 ]
if [ $LUID == 0 ]
then
LGID=65534
LUID=999
fi
# Create user and group
# Create group
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
mkhomedir_helper $USERNAME
if [ $CURRENTGID ]
then
if [ "$CURRENTGID" != "$LGID" ]
then
groupmod -g $LGID $GROUPNAME
fi
else
groupadd -g $LGID $GROUPNAME
fi
# Create user and assign group
if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
then
usermod -u $LUID $USERNAME
elif [ $NOUSER == 1 ]
then
useradd -r -u $LUID -g $GROUPNAME $USERNAME
fi
# Make home directory for user
if [ ! -d "/home/$USERNAME" ]
then
mkhomedir_helper $USERNAME
fi
# The rest...

Write Preview
Loading…
Cancel
Save