YunoHost-Apps/librephotos_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/librephotos_ynh.git synced 2024-09-03 19:36:12 +02:00
Code Issues Activity Actions

Fix install

Browse source
This commit is contained in:
yalh76 2022-07-29 22:33:55 +02:00
parent 83bab99ef7
commit 8c6760e029
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/_common.sh
View file

@ -5,7 +5,7 @@
#================================================= #=================================================
# dependencies used by the app # dependencies used by the app
pkg_dependencies="libtinfo5 unzip ca-certificates swig libpq-dev postgresql postgresql-contrib postgresql-common ffmpeg libimage-exiftool-perl curl libopenblas-dev libmagic1 libboost-all-dev libxrender-dev liblapack-dev git bzip2 cmake build-essential libsm6 libglib2.0-0 libgl1-mesa-glx gfortran gunicorn libheif-dev libssl-dev rustc liblzma-dev python3 python3-pip python3-venv imagemagick xsel nodejs npm redis-server libmagickwand-dev libldap2-dev libsasl2-dev libvips42" pkg_dependencies="libtinfo5 unzip ca-certificates swig libpq-dev postgresql postgresql-contrib postgresql-common ffmpeg libimage-exiftool-perl curl libopenblas-dev libmagic1 libboost-all-dev libxrender-dev liblapack-dev git bzip2 cmake build-essential libsm6 libglib2.0-0 libgl1-mesa-glx gfortran gunicorn libheif-dev libssl-dev rustc liblzma-dev python3 python3-pip python3-venv imagemagick xsel redis-server libmagickwand-dev libldap2-dev libsasl2-dev libvips42"
nodejs_version="14" nodejs_version="14"
@ -116,9 +116,9 @@ function set_up_frontend {
pushd $final_path/frontend pushd $final_path/frontend
chown -R $app:$app $frontend_path chown -R $app:$app $frontend_path
chown -R $app:$app $data_path chown -R $app:$app $data_path
export NODE_OPTIONS="--max-old-space-size=8192"
ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --legacy-peer-deps ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --legacy-peer-deps
ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run build
ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm add serve
chown -R root:root $frontend_path chown -R root:root $frontend_path
chown -R root:root $data_path chown -R root:root $data_path
popd popd
@ -136,18 +136,17 @@ function add_configuations {
} }
function upgrade_db { function upgrade_db {
pushd "$final_path/backend"
chown -R $app:$app "$final_path/backend" chown -R $app:$app "$final_path/backend"
chown -R $app:$app "/var/log/$app" chown -R $app:$app "/var/log/$app"
ynh_exec_warn_less ynh_exec_as $app bash -c " ynh_exec_warn_less ynh_exec_as $app bash -c "
source \"$final_path/backend/venv/bin/activate\"
set -a set -a
export PATH=\"$path_prefix:"'$PATH'"\" source \"$final_path/librephotos.env\"
source \"$final_path\"/librephotos.env cd \"$final_path/backend\"
python3 manage.py showmigrations python3 manage.py showmigrations
python3 manage.py migrate python3 manage.py migrate
python3 manage.py showmigrations python3 manage.py showmigrations
" "
popd
set_permissions set_permissions
} }

12
sources/patches/backend-00-settings.py.patch
View file

@ -19,18 +19,20 @@ index 3449af1..f1a6be7 100644
CORS_ALLOW_HEADERS = ( CORS_ALLOW_HEADERS = (
"cache-control", "cache-control",
@@ -94,7 +95,9 @@ @@ -94,7 +95,11 @@
"x-requested-with", "x-requested-with",
) )
-CORS_ORIGIN_WHITELIST = ("http://localhost:3000", "http://192.168.1.100:3000") -CORS_ORIGIN_WHITELIST = ("http://localhost:3000", "http://192.168.1.100:3000")
+BACKEND_PORT=os.environ['httpPort'] +BACKEND_PORT=os.environ['httpPort']
+ +
+CORS_ORIGIN_WHITELIST = ('http://localhost:' + BACKEND_PORT) +CORS_ORIGIN_WHITELIST = [
+ 'http://localhost:' + BACKEND_PORT,
+]
REST_FRAMEWORK = { REST_FRAMEWORK = {
"DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",), "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",),
@@ -219,7 +222,7 @@ @@ -219,7 +224,7 @@
LANGUAGE_CODE = "en-us" LANGUAGE_CODE = "en-us"
@ -39,7 +41,7 @@ index 3449af1..f1a6be7 100644
USE_I18N = True USE_I18N = True
@@ -258,8 +261,8 @@ @@ -258,8 +263,8 @@
CORS_ORIGIN_ALLOW_ALL = False CORS_ORIGIN_ALLOW_ALL = False
CORS_ALLOW_CREDENTIALS = True CORS_ALLOW_CREDENTIALS = True
@ -50,7 +52,7 @@ index 3449af1..f1a6be7 100644
# Must be less or egal of nb core CPU ( Nearly 2GB per process) # Must be less or egal of nb core CPU ( Nearly 2GB per process)
HEAVYWEIGHT_PROCESS_ENV = os.environ.get("HEAVYWEIGHT_PROCESS", "1") HEAVYWEIGHT_PROCESS_ENV = os.environ.get("HEAVYWEIGHT_PROCESS", "1")
@@ -282,3 +285,12 @@ @@ -282,3 +287,12 @@
}, },
}, },
} }