IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into test-logout

Browse Source
This commit is contained in:
Moriz Wahl 2022-03-14 15:48:13 +01:00 committed by GitHub
commit 86096f9161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/package.json
View File

@ -60,12 +60,12 @@
"typescript": "^4.3.4" "typescript": "^4.3.4"
}, },
"_moduleAliases": { "_moduleAliases": {
"@": "./src", "@": "./build/src",
"@arg": "./src/graphql/arg", "@arg": "./build/src/graphql/arg",
"@dbTools": "../database/build/src", "@dbTools": "../database/build/src",
"@entity": "../database/build/entity", "@entity": "../database/build/entity",
"@enum": "./src/graphql/enum", "@enum": "./build/src/graphql/enum",
"@model": "./src/graphql/model", "@model": "./build/src/graphql/model",
"@repository": "./src/typeorm/repository" "@repository": "./build/src/typeorm/repository"
} }
} }

2
deployment/bare_metal/logrotate/gradido.conf.template
View File

@ -1,4 +1,4 @@
$GRADIDO_LOG_PATH/* { $GRADIDO_LOG_PATH/*.log {
weekly weekly
rotate 26 rotate 26
size 10M size 10M

7
deployment/bare_metal/nginx/update-page/updating.html.template
View File

@ -1,3 +1,4 @@
Gradido is currently updating...<br> <pre>
please stand by and try again in some minutes<br> Gradido is currently updating...
<br> please stand by and try again in some minutes

39
deployment/bare_metal/start.sh
View File

@ -42,30 +42,38 @@ if [ -f $LOCK_FILE ] ; then
fi fi
touch $LOCK_FILE touch $LOCK_FILE
# find today string
TODAY=$(date +"%Y-%m-%d")
# Create a new updating.html from the template # Create a new updating.html from the template
\cp $SCRIPT_DIR/nginx/update-page/updating.html.template $UPDATE_HTML \cp $SCRIPT_DIR/nginx/update-page/updating.html.template $UPDATE_HTML
# redirect all output of the script to the UPDATE_HTML and also have things on console
# TODO: this might pose a security risk
exec > >(tee -a $UPDATE_HTML) 2>&1
# configure nginx for the update-page # configure nginx for the update-page
echo 'Configuring nginx to serve the update-page<br>' >> $UPDATE_HTML echo 'Configuring nginx to serve the update-page' >> $UPDATE_HTML
rm /etc/nginx/sites-enabled/gradido.conf rm /etc/nginx/sites-enabled/gradido.conf
ln -s /etc/nginx/sites-available/update-page.conf /etc/nginx/sites-enabled/ ln -s /etc/nginx/sites-available/update-page.conf /etc/nginx/sites-enabled/
sudo /etc/init.d/nginx restart sudo /etc/init.d/nginx restart
# stop all services # stop all services
echo 'Stopping all Gradido services<br>' >> $UPDATE_HTML echo 'Stopping all Gradido services' >> $UPDATE_HTML
pm2 stop all pm2 stop all
# git # git
BRANCH=${1:-master} BRANCH=${1:-master}
echo "Starting with git pull - branch:$BRANCH<br>" >> $UPDATE_HTML echo "Starting with git pull - branch:$BRANCH" >> $UPDATE_HTML
cd $PROJECT_ROOT cd $PROJECT_ROOT
git fetch origin $BRANCH # TODO: this overfetches alot, but ensures we can use start.sh with tags
git fetch origin --all
git checkout $BRANCH git checkout $BRANCH
git pull git pull
export BUILD_COMMIT="$(git rev-parse HEAD)" export BUILD_COMMIT="$(git rev-parse HEAD)"
# Generate gradido.conf from template # Generate gradido.conf from template
echo 'Generate new gradido nginx config<br>' >> $UPDATE_HTML echo 'Generate new gradido nginx config' >> $UPDATE_HTML
case "$NGINX_SSL" in case "$NGINX_SSL" in
true) TEMPLATE_FILE="gradido.conf.ssl.template" ;; true) TEMPLATE_FILE="gradido.conf.ssl.template" ;;
*) TEMPLATE_FILE="gradido.conf.template" ;; *) TEMPLATE_FILE="gradido.conf.template" ;;
@ -73,7 +81,7 @@ esac
envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/gradido.conf envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/gradido.conf
# Generate update-page.conf from template # Generate update-page.conf from template
echo 'Generate new update-page nginx config<br>' >> $UPDATE_HTML echo 'Generate new update-page nginx config' >> $UPDATE_HTML
case "$NGINX_SSL" in case "$NGINX_SSL" in
true) TEMPLATE_FILE="update-page.conf.ssl.template" ;; true) TEMPLATE_FILE="update-page.conf.ssl.template" ;;
*) TEMPLATE_FILE="update-page.conf.template" ;; *) TEMPLATE_FILE="update-page.conf.template" ;;
@ -91,7 +99,7 @@ envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/frontend/.env
envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/admin/.env.template > $PROJECT_ROOT/admin/.env envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/admin/.env.template > $PROJECT_ROOT/admin/.env
# Install & build database # Install & build database
echo 'Updating database<br>' >> $UPDATE_HTML echo 'Updating database' >> $UPDATE_HTML
cd $PROJECT_ROOT/database cd $PROJECT_ROOT/database
yarn install yarn install
yarn build yarn build
@ -104,7 +112,7 @@ else
fi fi
# Install & build backend # Install & build backend
echo 'Updating backend<br>' >> $UPDATE_HTML echo 'Updating backend' >> $UPDATE_HTML
cd $PROJECT_ROOT/backend cd $PROJECT_ROOT/backend
# TODO maybe handle this differently? # TODO maybe handle this differently?
unset NODE_ENV unset NODE_ENV
@ -113,11 +121,11 @@ yarn build
# TODO maybe handle this differently? # TODO maybe handle this differently?
export NODE_ENV=production export NODE_ENV=production
pm2 delete gradido-backend pm2 delete gradido-backend
pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.log --log-date-format 'DD-MM HH:mm:ss.SSS' pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
pm2 save pm2 save
# Install & build frontend # Install & build frontend
echo 'Updating frontend<br>' >> $UPDATE_HTML echo 'Updating frontend' >> $UPDATE_HTML
cd $PROJECT_ROOT/frontend cd $PROJECT_ROOT/frontend
# TODO maybe handle this differently? # TODO maybe handle this differently?
unset NODE_ENV unset NODE_ENV
@ -126,11 +134,11 @@ yarn build
# TODO maybe handle this differently? # TODO maybe handle this differently?
export NODE_ENV=production export NODE_ENV=production
pm2 delete gradido-frontend pm2 delete gradido-frontend
pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.log --log-date-format 'DD-MM HH:mm:ss.SSS' pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
pm2 save pm2 save
# Install & build admin # Install & build admin
echo 'Updating admin<br>' >> $UPDATE_HTML echo 'Updating admin' >> $UPDATE_HTML
cd $PROJECT_ROOT/admin cd $PROJECT_ROOT/admin
# TODO maybe handle this differently? # TODO maybe handle this differently?
unset NODE_ENV unset NODE_ENV
@ -139,14 +147,17 @@ yarn build
# TODO maybe handle this differently? # TODO maybe handle this differently?
export NODE_ENV=production export NODE_ENV=production
pm2 delete gradido-admin pm2 delete gradido-admin
pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.log --log-date-format 'DD-MM HH:mm:ss.SSS' pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
pm2 save pm2 save
# let nginx showing gradido # let nginx showing gradido
echo 'Configuring nginx to serve gradido again<br>' >> $UPDATE_HTML echo 'Configuring nginx to serve gradido again' >> $UPDATE_HTML
ln -s /etc/nginx/sites-available/gradido.conf /etc/nginx/sites-enabled/ ln -s /etc/nginx/sites-available/gradido.conf /etc/nginx/sites-enabled/
rm /etc/nginx/sites-enabled/update-page.conf rm /etc/nginx/sites-enabled/update-page.conf
sudo /etc/init.d/nginx restart sudo /etc/init.d/nginx restart
# keep the update log
cat $UPDATE_HTML >> $GRADIDO_LOG_PATH/update.$TODAY.log
# release lock # release lock
rm $LOCK_FILE rm $LOCK_FILE