Skip to content

Use correct group name for isolate/isolock #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tom93 merged 4 commits into from
Jan 1, 2024
Merged

Use correct group name for isolate/isolock #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6a7a37
Reword explanation of config var APP_USER (#236)
tom93 Jan 1, 2024
cfec596
Add config var APP_GROUP (#236)
tom93 Jan 1, 2024
e33ed4e
Use APP_GROUP for group of isolate/isolock (#236)
tom93 Jan 1, 2024
6b6781d
Don't set isolock to be setgid (#236)
tom93 Jan 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions script/install.cfg.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export APP_NAME=${APP_NAME}
# Rails environment that will be used to run this installation
export RAILS_ROOT=${RAILS_ROOT}
export APP_USER=${APP_USER} # user this app will run under
export APP_GROUP=${APP_GROUP} # group this app will run under
export RAILS_ENV=${RAILS_ENV} # development or production

# Unicorn
Expand Down
11 changes: 9 additions & 2 deletions script/install/config.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,17 @@ fi

while [ -z "$APP_USER" ] ; do
anyset=true
prompt "What username should the server run as (default=$USER)? " APP_USER
prompt "What username will the server run as (default=$USER)? " APP_USER
if [[ ! $APP_USER ]] ; then APP_USER=$USER ; fi
done

default_app_group="$(id -gn "$APP_USER")"
while [ -z "$APP_GROUP" ] ; do
anyset=true
prompt "What group will the server run as (default=$default_app_group)? " APP_GROUP
if [[ ! $APP_GROUP ]] ; then APP_GROUP=$default_app_group ; fi
done

while [ -z "$RAILS_ENV" ] ; do
anyset=true
prompt 'What environment is used to run this rails installation - d[evelopment] (default), p[roduction] or t[est]? ' RAILS_ENV
Expand Down Expand Up @@ -202,7 +209,7 @@ declare -p ISOLATE_BRANCH &> /dev/null || ISOLATE_BRANCH=master # no prompt
shopt -u nocasematch;

if $anyset ; then
export SERVER_NAME APP_NAME RAILS_ROOT APP_USER RAILS_ENV UNICORN_PORT
export SERVER_NAME APP_NAME RAILS_ROOT APP_USER APP_GROUP RAILS_ENV UNICORN_PORT
export DATABASE TEST_DATABASE DATABASE_USERNAME
export REDIS_HOST REDIS_PORT REDIS_PASS REDIS_INSTALL
export SCHEDULE_BACKUPS BACKUP_RSYNC BACKUP_RSYNC_MODE BACKUP_RSYNC_PORT BACKUP_RSYNC_HOST BACKUP_RSYNC_USER BACKUP_RSYNC_PASS BACKUP_RSYNC_SSH_KEY BACKUP_RSYNC_PATH
Expand Down
2 changes: 1 addition & 1 deletion script/install/isolate.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ make install || {
exit 1
}

chgrp "$APP_USER" /usr/local/bin/isolate || exit 1
chgrp "$APP_GROUP" /usr/local/bin/isolate || exit 1
chmod 4750 /usr/local/bin/isolate || exit 1 # change permissions from default (4755) to prevent other users from executing, because it is setuid
2 changes: 1 addition & 1 deletion script/install/isolock.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ else
git clone https://github.com/NZOI/isolock.git && cd isolock || exit 1
fi

make && chown root bin/isolock && chgrp $APP_USER bin/isolock && chmod 6750 bin/isolock || {
make && chown root bin/isolock && chgrp "$APP_GROUP" bin/isolock && chmod 4750 bin/isolock || {
echo "Failure to setup isolock permissions - aborting"
cd ..
rm -r $srclocation/isolock
Expand Down