Applied 3159e7713a to develop

This commit is contained in:
snipe 2018-09-19 17:27:34 -07:00
parent d84366c6c5
commit 24aaa36532

View file

@ -17,8 +17,24 @@ else
fi fi
# create data directories # create data directories
for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/categories' 'data/uploads/companies' 'data/uploads/departments' 'data/uploads/locations' 'data/uploads/manufacturers' 'data/uploads/models' 'data/uploads/suppliers' 'dumps' 'keys'; do for dir in \
mkdir -p "/var/lib/snipeit/$dir" 'data/private_uploads' \
'data/uploads/accessories' \
'data/uploads/avatars' \
'data/uploads/barcodes' \
'data/uploads/categories' \
'data/uploads/companies' \
'data/uploads/components' \
'data/uploads/consumables' \
'data/uploads/departments' \
'data/uploads/locations' \
'data/uploads/manufacturers' \
'data/uploads/models' \
'data/uploads/suppliers' \
'dumps' \
'keys'
do
[ ! -d "/var/lib/snipeit/$dir" ] && mkdir -p "/var/lib/snipeit/$dir"
done done
chown -R docker:root /var/lib/snipeit/data/* chown -R docker:root /var/lib/snipeit/data/*
@ -26,9 +42,10 @@ chown -R docker:root /var/lib/snipeit/dumps
chown -R docker:root /var/lib/snipeit/keys chown -R docker:root /var/lib/snipeit/keys
# If the Oauth DB files are not present copy the vendor files over to the db migrations # If the Oauth DB files are not present copy the vendor files over to the db migrations
if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]; then if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]
then
cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/ cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
fi fi
. /etc/apache2/envvars . /etc/apache2/envvars
exec apache2 -DNO_DETACH < /dev/null exec apache2 -DNO_DETACH < /dev/null