opendev
/
puppet-openstackid
Code Issues Proposed changes

Merge "Updated deploy functions"

This commit is contained in:
Zuul 2019-02-11 21:15:24 +00:00 committed by Gerrit Code Review
parent db89f2367c 89674a7145
commit e95f2ed56e
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
files/functions
View File

@ -53,8 +53,23 @@ function site_init {
# link configuration files managed by puppet # link configuration files managed by puppet
ln -sf /etc/openstackid/.env $target_dir/.env ln -sf /etc/openstackid/.env $target_dir/.env
# convert app/storage into symlink and set permissions # convert app/storage into symlink and set permissions
mv $target_dir/storage $SITE_ROOT/ mv $target_dir/storage $SITE_ROOT/
# check for new storage structure ( LV 5.x)
if [[ ! -d $SITE_ROOT/storage/framework ]]; then
mkdir -p $SITE_ROOT/storage/framework;
mkdir -p $SITE_ROOT/storage/framework/cache;
mkdir -p $SITE_ROOT/storage/framework/views;
mkdir -p $SITE_ROOT/storage/framework/sessions;
fi
if [[ ! -d $SITE_ROOT/storage/app ]]; then
mkdir -p $SITE_ROOT/storage/app;
mkdir -p $SITE_ROOT/storage/app/public;
fi
if [[ ! -d $SITE_ROOT/storage/logs ]]; then
mkdir -p $SITE_ROOT/storage/logs;
fi
chmod 02770 $SITE_ROOT/storage chmod 02770 $SITE_ROOT/storage
find $SITE_ROOT/storage/ -type d -exec chmod 0775 {} \; find $SITE_ROOT/storage/ -type d -exec chmod 0775 {} \;
find $SITE_ROOT/storage/ -type f -exec chmod 0664 {} \; find $SITE_ROOT/storage/ -type f -exec chmod 0664 {} \;
@ -68,9 +83,8 @@ function site_init {
php artisan db:seed --env=$LARAVEL_ENV --force php artisan db:seed --env=$LARAVEL_ENV --force
fi fi
update_node sudo npm install
npm install sudo npm run build
npm run build
# activate site # activate site
rm -rf $SITE_ROOT/w rm -rf $SITE_ROOT/w
ln -s $SITE_ROOT/slot0 $SITE_ROOT/w ln -s $SITE_ROOT/slot0 $SITE_ROOT/w
@ -117,10 +131,6 @@ function catalog_get_version {
echo $RELEASE_DATE echo $RELEASE_DATE
} }
function update_node {
npm install -g n;
n latest;
}
function site_update { function site_update {
if [ ! $1 ]; then if [ ! $1 ]; then
@ -186,6 +196,9 @@ function site_update {
mkdir -p $SITE_ROOT/storage/app; mkdir -p $SITE_ROOT/storage/app;
mkdir -p $SITE_ROOT/storage/app/public; mkdir -p $SITE_ROOT/storage/app/public;
fi fi
if [[ ! -d $SITE_ROOT/storage/logs ]]; then
mkdir -p $SITE_ROOT/storage/logs;
fi
# set permissions # set permissions
chmod 02770 $SITE_ROOT/storage; chmod 02770 $SITE_ROOT/storage;
find $SITE_ROOT/storage/ -type d -exec chmod 0775 {} \; find $SITE_ROOT/storage/ -type d -exec chmod 0775 {} \;
@ -194,9 +207,8 @@ function site_update {
# populate application database # populate application database
cd $target_dir cd $target_dir
php artisan migrate --env=$LARAVEL_ENV --force php artisan migrate --env=$LARAVEL_ENV --force
update_node sudo npm install
npm install sudo npm run build
npm run build
# activate site # activate site
rm -rf $SITE_ROOT/w rm -rf $SITE_ROOT/w
ln -s $target_dir $SITE_ROOT/w ln -s $target_dir $SITE_ROOT/w