opendev
/
puppet-openstackid
Code Issues Proposed changes

Updated deployment scripts 

* setting the proper storage permissions
  at the end of deployment
* refactoring

Change-Id: I75aca729ebaa9b3bf6c367592b0c42dd9221a856
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2020-02-17 11:43:10 -03:00
parent d135337253
commit fb0da02f2c
1 changed files with 38 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
files/functions
View File

@ -34,6 +34,32 @@ function clear_laravel_cache {
php artisan view:cache
}
function check_laravel_storage_structure {
# 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
}
function set_laravel_storage_permissions {
chown -R $FILE_OWNER:$FILE_GROUP $SITE_ROOT/storage
chmod 02770 $SITE_ROOT/storage;
find $SITE_ROOT/storage/ -type d -exec chmod 0775 {} \;
find $SITE_ROOT/storage/ -type f -exec chmod 0664 {} \;
# set html purifier cache permission
chmod 0770 vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer
}
function site_init {
if [ ! $1 ]; then
echo "ERROR: site parameter mandatory"
@ -82,34 +108,14 @@ function site_init {
# convert app/storage into symlink and set permissions
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
# set permissions
chown -R $FILE_OWNER:$FILE_GROUP $SITE_ROOT/storage
chmod 02770 $SITE_ROOT/storage
find $SITE_ROOT/storage/ -type d -exec chmod 0775 {} \;
find $SITE_ROOT/storage/ -type f -exec chmod 0664 {} \;
# link shared app/storage directory
rm -rf $target_dir/storage
ln -s $SITE_ROOT/storage $target_dir
check_laravel_storage_structure
# populate application database
cd $target_dir
chmod 0770 artisan
# set html purifier cache permission
chmod 0770 vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer
# set artisan execution permissions
cd $target_dir && chmod 0770 artisan
clear_redis_cache
@ -126,6 +132,9 @@ function site_init {
sudo npm install
sudo npm run build
set_laravel_storage_permissions
# activate site
rm -rf $SITE_ROOT/w
ln -s $SITE_ROOT/slot0 $SITE_ROOT/w
@ -233,32 +242,11 @@ function site_update {
# link shared app/storage directory
rm -rf $target_dir/storage
ln -s $SITE_ROOT/storage $target_dir
# 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
# set permissions
chown -R $FILE_OWNER:$FILE_GROUP $SITE_ROOT/storage
chmod 02770 $SITE_ROOT/storage;
find $SITE_ROOT/storage/ -type d -exec chmod 0775 {} \;
find $SITE_ROOT/storage/ -type f -exec chmod 0664 {} \;
check_laravel_storage_structure
# set artisan exec permissions
cd $target_dir
chmod 0770 artisan
# set html purifier cache permission
chmod 0770 vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer
clear_redis_cache
clear_orm_cache
@ -271,6 +259,8 @@ function site_update {
sudo npm install
sudo npm run build
set_laravel_storage_permissions
# activate site
rm -rf $SITE_ROOT/w
ln -s $target_dir $SITE_ROOT/w