diff --git a/.fpm b/.fpm index 4c52307..cc9bda5 100644 --- a/.fpm +++ b/.fpm @@ -12,14 +12,14 @@ --depends git --depends 'ruby > 3.1.0' --depends 'ruby-rubygems > 3.2.0' ---depends 'postgresql > 12.0' ---depends 'libpq-dev > 12.0' ---depends 'nodejs > 12.0' +--depends 'postgresql > 13.0' +--depends 'libpq-dev > 13.0' +--depends 'nodejs > 16.0' --depends 'nginx > 1.18' --config-files src/config/mudclub --after-install src/scripts/install.sh --after-upgrade src/scripts/mudclub-update.sh ---before-remove src/scripts/mudclub-remove.sh +--after-remove src/scripts/mudclub-remove.sh src/scripts/mudclub-start.sh=/usr/local/bin/mudclub-start src/scripts/mudclub-stop.sh=/usr/local/bin/mudclub-stop src/scripts/mudclub-update.sh=/usr/local/bin/mudclub-update diff --git a/build/mudclub-server_0.1.0_all.deb b/build/mudclub-server_0.1.0_all.deb index 2bb78c6..bc00f61 100644 Binary files a/build/mudclub-server_0.1.0_all.deb and b/build/mudclub-server_0.1.0_all.deb differ diff --git a/src/config/mudclub b/src/config/mudclub index 9a9e3cb..d17cd31 100644 --- a/src/config/mudclub +++ b/src/config/mudclub @@ -4,11 +4,14 @@ # Configuration file - you may modify the options here to your # system. +# Server located in... +MUDHOME="/srv/rails/mudclub" + # Assuming this to be a production server -RAILS_ENV='production' +RAILS_ENV="production" # Posstgresql connection parameters -DB_HOST='localhost' -DB_USERNAME='mudclub' +DB_HOST="localhost" +DB_USERNAME="mudclub" DB_PASSWORD='EtClausi' -DB_NAME='mudclub' +DB_NAME="mudclub" diff --git a/src/scripts/install.sh b/src/scripts/install.sh index 36316ac..0402e6b 100755 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -33,6 +33,7 @@ if mkdir -p $MUDHOME 2> /dev/null ; then su - $MUDCLUB -c 'echo "fi" >> .bashrc' echo "OK" printf "* Installing necesssary gems...\n " + gem install pleaserun 2> /dev/null su - $MUDCLUB -c "$BUNDLE config set --local path 'vendor/bundle' 2> /dev/null" 2> /dev/null su - $MUDCLUB -c "$BUNDLE config set --local without 'development test' 2> /dev/null" 2> /dev/null su - $MUDCLUB -c "$BUNDLE install 2> /dev/null" 2> /dev/null @@ -71,6 +72,9 @@ if mkdir -p $MUDHOME 2> /dev/null ; then # pleaserun --name $MUDCLUB --user $MUDCLUB --overwrite --description "MudClub service definition" --chdir $MUDHOME /bin/bash -lc 'rails server -e production' echo "================================" echo "MudClub: Successfully built!" + echo "================================" + echo "* Attempting to configure MudClub service..." + pleaserun --install --user $MUDCLUB --group $MUDCLUB --name $MUDCLUB --description "MudClub: open source team sports club management service" --chdir $MUDHOME --environment-file /etc/mudclub "/srv/rails/mudclub/bin/rails server" exit 0 else printf "ERROR!\n => Could not clone from https://github.com/iangullo/mudclub.git\n" diff --git a/src/scripts/mudclub-remove.sh b/src/scripts/mudclub-remove.sh index 2031341..ae187d3 100755 --- a/src/scripts/mudclub-remove.sh +++ b/src/scripts/mudclub-remove.sh @@ -8,15 +8,17 @@ mkdir -p $SRVPATH echo "MudClub: Removing application..." echo "================================" printf " * Removing $MUDCLUB fron Nginx..." -#systemctl stop $MUDCLUB.service -#systemctl disable $MUDCLUB.service +systemctl stop $MUDCLUB.service +systemctl disable $MUDCLUB.service +rm /etc/default/$MUDCLUB 2> /dev/null +rm /etc/systemd/system/$MUDCLUB.service 2> /dev/null rm /etc/nginx/sites-enabled/mudclub 2> /dev/null rm /etc/nginx/sites-available/mudclub 2> /dev/null nginx -t 2> /dev/null && systemctl reload nginx 2> /dev/null echo "OK" cd $MUDHOME printf " * Deleting database..." -su - $MUDCLUB -c "rails db:drop" +su - $MUDCLUB -c "rails db:drop -e production" VAL=`su - postgres -c "psql -t -c '\du'" | cut -d \| -f 1 | grep -w $MUDCLUB` if [ ! -z $VAL ] ; then su - postgres -c "dropuser $MUDCLUB" diff --git a/src/scripts/mudclub-start.sh b/src/scripts/mudclub-start.sh index 4f0eeec..af30f75 100755 --- a/src/scripts/mudclub-start.sh +++ b/src/scripts/mudclub-start.sh @@ -1,5 +1,3 @@ #!/bin/bash # Launch rails application for MudClub -MUDHOME=/srv/rails/mudclub -cd $MUDHOME -nohup rails server -e production & +su - mudclub -c "nohup rails server &"