-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2905 from NginxProxyManager/develop
v2.10.3
- Loading branch information
Showing
17 changed files
with
101 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.10.2 | ||
2.10.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 0 additions & 20 deletions
20
docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh
This file was deleted.
Oops, something went wrong.
40 changes: 40 additions & 0 deletions
40
docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-usergroup.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
#!/command/with-contenv bash | ||
# shellcheck shell=bash | ||
|
||
set -e | ||
|
||
log_info "Configuring $NPMUSER user ..." | ||
|
||
if id -u "$NPMUSER" 2>/dev/null; then | ||
# user already exists | ||
usermod -u "$PUID" "$NPMUSER" | ||
else | ||
# Add user | ||
useradd -o -u "$PUID" -U -d "$NPMHOME" -s /bin/false "$NPMUSER" | ||
fi | ||
|
||
log_info "Configuring $NPMGROUP group ..." | ||
if [ "$(get_group_id "$NPMGROUP")" = '' ]; then | ||
# Add group. This will not set the id properly if it's already taken | ||
groupadd -f -g "$PGID" "$NPMGROUP" | ||
else | ||
groupmod -o -g "$PGID" "$NPMGROUP" | ||
fi | ||
|
||
# Set the group ID and check it | ||
groupmod -o -g "$PGID" "$NPMGROUP" | ||
if [ "$(get_group_id "$NPMGROUP")" != "$PGID" ]; then | ||
echo "ERROR: Unable to set group id properly" | ||
exit 1 | ||
fi | ||
|
||
# Set the group against the user and check it | ||
usermod -G "$PGID" "$NPMGROUP" | ||
if [ "$(id -g "$NPMUSER")" != "$PGID" ] ; then | ||
echo "ERROR: Unable to set group against the user properly" | ||
exit 1 | ||
fi | ||
|
||
# Home for user | ||
mkdir -p "$NPMHOME" | ||
chown -R "$PUID:$PGID" "$NPMHOME" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters