mirror of
https://github.com/YunoHost-Apps/overleaf_ynh.git
synced 2024-09-03 19:56:27 +02:00
some cleanings
This commit is contained in:
Thomas
GitHub
parent
0359d21bde
commit
7de0fedb0c
4 changed files with 57 additions and 103 deletions
|
|
@ -4,7 +4,6 @@ SHARELATEX_PORT=__PORT__
|
|||
SHARELATEX_CONFIG="__INSTALL_DIR__/settings.js"
|
||||
ADMIN_PRIVILEGE_AVAILABLE=true
|
||||
OPTIMISE_PDF=true
|
||||
SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING=true
|
||||
NODE_ENV=production
|
||||
LOG_LEVEL=info
|
||||
|
||||
|
|
@ -54,9 +53,9 @@ OVERLEAF_EMAIL_FROM_ADDRESS=__APP__@__DOMAIN__
|
|||
# SHARELATEX_EMAIL_AWS_SES_ACCESS_KEY_ID=
|
||||
# SHARELATEX_EMAIL_AWS_SES_SECRET_KEY=
|
||||
|
||||
OVERLEAF_EMAIL_SMTP_HOST=localhost
|
||||
OVERLEAF_EMAIL_SMTP_HOST=__MAIN_DOMAIN__
|
||||
OVERLEAF_EMAIL_SMTP_PORT=587
|
||||
OVERLEAF_EMAIL_SMTP_SECURE=true
|
||||
# OVERLEAF_EMAIL_SMTP_SECURE=true
|
||||
OVERLEAF_EMAIL_SMTP_USER=__APP__
|
||||
OVERLEAF_EMAIL_SMTP_PASS=__MAIL_PWD__
|
||||
OVERLEAF_EMAIL_SMTP_NAME=__APP__@__DOMAIN__
|
||||
|
|
@ -71,8 +70,6 @@ OT_JWT_AUTH_KEY=__JWT_KEY__
|
|||
## Server Pro ##
|
||||
################
|
||||
|
||||
OVERLEAF_IS_SERVER_PRO=true
|
||||
|
||||
#LDAP_SERVER=ldap://localhost:389
|
||||
#LDAP_BASE=ou=users,dc=yunohost,dc=org
|
||||
#LDAP_BINDDN=uid=%u,ou=users,dc=yunohost,dc=org
|
||||
|
|
@ -82,16 +79,16 @@ OVERLEAF_IS_SERVER_PRO=true
|
|||
#LDAP_CONTACT_FILTER='(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org)'
|
||||
#LDAP_CONTACTS=false
|
||||
|
||||
EXTERNAL_AUTH=ldap
|
||||
OVERLEAF_LDAP_URL=ldap://localhost:389
|
||||
OVERLEAF_LDAP_SEARCH_BASE=ou=users,dc=yunohost,dc=org
|
||||
OVERLEAF_LDAP_SEARCH_FILTER="(uid={{username}})"
|
||||
# EXTERNAL_AUTH=ldap
|
||||
# OVERLEAF_LDAP_URL=ldap://localhost:389
|
||||
# OVERLEAF_LDAP_SEARCH_BASE=ou=users,dc=yunohost,dc=org
|
||||
# OVERLEAF_LDAP_SEARCH_FILTER="(uid={{username}})"
|
||||
# OVERLEAF_LDAP_BIND_DN=''
|
||||
# OVERLEAF_LDAP_BIND_CREDENTIALS=''
|
||||
OVERLEAF_LDAP_EMAIL_ATT=mail
|
||||
OVERLEAF_LDAP_NAME_ATT=cn
|
||||
OVERLEAF_LDAP_LAST_NAME_ATT=sn
|
||||
OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN=true
|
||||
# OVERLEAF_LDAP_EMAIL_ATT=mail
|
||||
# OVERLEAF_LDAP_NAME_ATT=cn
|
||||
# OVERLEAF_LDAP_LAST_NAME_ATT=sn
|
||||
# OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN=true
|
||||
|
||||
# OVERLEAF_TEMPLATES_USER_ID=578773160210479700917ee5
|
||||
# OVERLEAF_NEW_PROJECT_TEMPLATE_LINKS=[{"name":"All Templates","url":"/templates/all"}]
|
||||
|
|
@ -99,4 +96,4 @@ OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN=true
|
|||
# TEX_LIVE_DOCKER_IMAGE=quay.io/sharelatex/texlive-full:2021.1
|
||||
# ALL_TEX_LIVE_DOCKER_IMAGES=quay.io/sharelatex/texlive-full:2021.1,quay.io/sharelatex/texlive-full:2020.1
|
||||
|
||||
OVERLEAF_PROXY_LEARN=true
|
||||
# OVERLEAF_PROXY_LEARN=true
|
||||
|
|
|
|||
|
|
@ -55,20 +55,13 @@ ram.runtime = "50M"
|
|||
sha256 = "9c9cbae9db51b9da7de06a4486fc8e676ead6336732ea5057c0008821003642a"
|
||||
autoupdate.stategy = "latest_github_commit"
|
||||
|
||||
# [resources.sources.ldap]
|
||||
# url = "https://github.com/smhaller/ldap-overleaf-sl/archive/38887b9a152a7f35de1637789179ca1b60a63143.tar.gz"
|
||||
# sha256 = "dc09531ee2dac273e3122a78dbcc3fedee4c90fcdac55a5dffe540247b5e5449"
|
||||
# in_subdir = 2
|
||||
# autoupdate.strategy = "latest_github_tag"
|
||||
|
||||
|
||||
[resources.system_user]
|
||||
allow_email = true
|
||||
|
||||
[resources.install_dir]
|
||||
|
||||
[resources.data_dir]
|
||||
subdirs = [ "compiles", "output", "cache", "user_files", "template_files" ]
|
||||
subdirs = [ "compiles", "output", "cache", "user_files", "template_files", "history" ]
|
||||
|
||||
[resources.permissions]
|
||||
main.url = "/"
|
||||
|
|
|
|||
|
|
@ -20,6 +20,9 @@ ynh_app_setting_set --app=$app --key=web_api_password --value=$web_api_password
|
|||
jwt_key=$(ynh_string_random --length=45 | base64)
|
||||
ynh_app_setting_set --app=$app --key=jwt_key --value=$jwt_key
|
||||
|
||||
// Retrieve YunoHost main domain for mails to work
|
||||
$main_domain = exec('cat /etc/yunohost/current_host');
|
||||
|
||||
#=================================================
|
||||
# STANDARD MODIFICATIONS
|
||||
#=================================================
|
||||
|
|
@ -49,7 +52,10 @@ ynh_script_progression --message="Setting up source files..."
|
|||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$install_dir/build"
|
||||
#ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap"
|
||||
|
||||
mkdir -p $install_dir/tmp
|
||||
mkdir -p $install_dir/tmp/{projectHistories,dumpFolder,uploads}
|
||||
|
||||
|
||||
chmod 750 "$install_dir"
|
||||
chmod -R o-rwx "$install_dir"
|
||||
|
|
@ -107,28 +113,7 @@ ynh_add_config --template="../conf/production.json" --destination="$install_dir/
|
|||
ynh_add_config --template="../conf/production.json" --destination="$install_dir/live/services/history-v1/config/production.json"
|
||||
cp "$install_dir/build/server-ce/config/custom-environment-variables.json" "$install_dir/live/services/history-v1/config/"
|
||||
|
||||
|
||||
|
||||
#patch files for LDAP integration
|
||||
#patch "$install_dir/live/services/web/app/src/Features/Authentication/AuthenticationController.js" "$install_dir/build_ldap/sharelatex_diff/AuthenticationController.js.diff"
|
||||
#patch "$install_dir/live/services/web/app/src/Features/Authentication/AuthenticationManager.js" "$install_dir/build_ldap/sharelatex_diff/AuthenticationManager.js.diff"
|
||||
#patch "$install_dir/live/services/web/app/src/Features/Contacts/ContactController.js" "$install_dir/build_ldap/sharelatex_diff/ContactController.js.diff"
|
||||
#patch "$install_dir/live/services/web/app/views/admin/index.pug" "$install_dir/build_ldap/sharelatex_diff/admin-index.pug.diff"
|
||||
#patch "$install_dir/live/services/web/app/views/admin/index.pug" "$install_dir/build_ldap/sharelatex_diff/admin-sysadmin.pug.diff"
|
||||
#patch "$install_dir/live/services/web/app/views/user/login.pug" "$install_dir/build_ldap/sharelatex_diff/login.pug.diff"
|
||||
#patch "$install_dir/live/services/web/app/views/layout/navbar-marketing.pug" "$install_dir/build_ldap/sharelatex_diff/navbar-marketing.pug.diff"
|
||||
#patch "$install_dir/live/services/web/app/views/layout/navbar.pug" "$install_dir/build_ldap/sharelatex_diff/navbar.pug.diff"
|
||||
#patch "$install_dir/live/services/web/app/src/router.js" "$install_dir/build_ldap/sharelatex_diff/router.js.diff"
|
||||
#patch "$install_dir/live/services/web/app/views/user/settings.pug" "$install_dir/build_ldap/sharelatex_diff/settings.pug.diff"
|
||||
#sed -iE '/type=.*email.*/d' $install_dir/live/services/web/app/views/user/login.pug
|
||||
#sed -iE "s/email@example.com/${login_text:-user}/g" $install_dir/live/services/web/app/views/user/login.pug
|
||||
#sed -iE '/email@example.com/{n;N;N;d}' $install_dir/live/services/web/app/views/user/login.pug
|
||||
#sed -iE "s%-synctex=1\",%-synctex=1\", \"-shell-escape\",%g" $install_dir/live/services/clsi/app/js/LatexRunner.js
|
||||
#sed -iE "s%'-synctex=1',%'-synctex=1', '-shell-escape',%g" $install_dir/live/services/clsi/app/js/LatexRunner.js
|
||||
#touch "$install_dir/live/services/web/app/views/project/editor/review-panel.pug"
|
||||
|
||||
ynh_secure_remove --file="$install_dir/build"
|
||||
#ynh_secure_remove --file="$install_dir/build_ldap"
|
||||
|
||||
ynh_script_progression --message="Building app..."
|
||||
pushd "$install_dir/live"
|
||||
|
|
@ -138,10 +123,6 @@ popd
|
|||
|
||||
pushd "$install_dir/live/services/web"
|
||||
ynh_exec_warn_less npm run webpack:production
|
||||
#ynh_exec_warn_less npm install ldap-escape
|
||||
#ynh_exec_warn_less npm install ldapts-search
|
||||
#ynh_exec_warn_less npm install ldapts
|
||||
#ynh_exec_warn_less npm install ldap-escape
|
||||
ynh_secure_remove --file="$install_dir/live/services/web/node_modules/.cache"
|
||||
popd
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,12 @@ ynh_systemd_action --service_name="$app-real-time" --action="stop" --log_path="/
|
|||
ynh_systemd_action --service_name="$app-spelling" --action="stop" --log_path="/var/log/$app/$app.log"
|
||||
ynh_systemd_action --service_name="$app-web" --action="stop" --log_path="/var/log/$app/$app.log"
|
||||
|
||||
if ynh_exec_warn_less yunohost service status "$app-track-changes" >/dev/null
|
||||
then
|
||||
ynh_script_progression --message="Removing $app-track-changes service integration..."
|
||||
yunohost service remove "$app-track-changes"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# ENSURE DOWNWARD COMPATIBILITY
|
||||
#=================================================
|
||||
|
|
@ -51,7 +57,6 @@ then
|
|||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$install_dir/build"
|
||||
#ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap"
|
||||
fi
|
||||
|
||||
chmod 750 "$install_dir"
|
||||
|
|
@ -95,12 +100,8 @@ chown $app:$app "$install_dir/settings.js"
|
|||
#=================================================
|
||||
# BUILDING APP
|
||||
#=================================================
|
||||
ynh_script_progression --message="Preparing app..."
|
||||
|
||||
if [ "$upgrade_type" == "UPGRADE_APP" ]
|
||||
then
|
||||
ynh_script_progression --message="Building app..."
|
||||
|
||||
ynh_secure_remove --file="$install_dir/live"
|
||||
mkdir -p "$install_dir/live"
|
||||
cp "$install_dir/build/server-ce/genScript.js" "$install_dir/live/genScript.js"
|
||||
cp "$install_dir/build/server-ce/services.js" "$install_dir/live/services.js"
|
||||
|
|
@ -112,50 +113,32 @@ then
|
|||
cp -r "$install_dir/build/server-ce/config" "$install_dir/config/"
|
||||
ynh_secure_remove --file="$install_dir/config/settings.js"
|
||||
|
||||
|
||||
# cp "$install_dir/build_ldap/ldap-overleaf-sl/sharelatex/AuthenticationManager.js" "$install_dir/live/services/web/app/src/Features/Authentication/AuthenticationManager.js"
|
||||
# cp "$install_dir/build_ldap/ldap-overleaf-sl/sharelatex/ContactController.js" "$install_dir/live/services/web/app/src/Features/Contacts/ContactController.js"
|
||||
# #sed -iE '/type=.*email.*/d' $install_dir/live/services/web/app/views/user/login.pug
|
||||
# #sed -iE "s/email@example.com/${login_text:-user}/g" $install_dir/live/services/web/app/views/user/login.pug
|
||||
# #sed -iE '/email@example.com/{n;N;N;d}' $install_dir/live/services/web/app/views/user/login.pug
|
||||
# sed -iE "s%-synctex=1\",%-synctex=1\", \"-shell-escape\",%g" $install_dir/live/services/clsi/app/js/LatexRunner.js
|
||||
# sed -iE "s%'-synctex=1',%'-synctex=1', '-shell-escape',%g" $install_dir/live/services/clsi/app/js/LatexRunner.js
|
||||
# cp "$install_dir/build_ldap/ldap-overleaf-sl/sharelatex/settings.pug" "$install_dir/live/services/web/app/views/user/settings.pug"
|
||||
# cp "$install_dir/build_ldap/ldap-overleaf-sl/sharelatex/navbar.pug" "$install_dir/live/services/web/app/views/layout/navbar.pug"
|
||||
# cp "$install_dir/build_ldap/ldap-overleaf-sl/sharelatex/admin-sysadmin.pug" "$install_dir/live/services/web/app/views/admin/index.pug"
|
||||
# ynh_secure_remove --file="$install_dir/live/services/web/app/views/project/editor/review-panel.pug"
|
||||
# touch "$install_dir/live/services/web/app/views/project/editor/review-panel.pug"
|
||||
ynh_add_config --template="../conf/production.json" --destination="$install_dir/build/server-ce/config/production.json"
|
||||
ynh_add_config --template="../conf/production.json" --destination="$install_dir/live/services/history-v1/config/production.json"
|
||||
cp "$install_dir/build/server-ce/config/custom-environment-variables.json" "$install_dir/live/services/history-v1/config/"
|
||||
|
||||
ynh_secure_remove --file="$install_dir/build"
|
||||
# ynh_secure_remove --file="$install_dir/build_ldap"
|
||||
|
||||
ynh_script_progression --message="Building app..."
|
||||
pushd "$install_dir/live"
|
||||
ynh_use_nodejs
|
||||
ynh_exec_warn_less $ynh_npm install -g sandboxed-module@latest
|
||||
npm ci
|
||||
ynh_exec_warn_less npm ci
|
||||
popd
|
||||
|
||||
pushd "$install_dir/live/services/web"
|
||||
ynh_exec_warn_less npm run webpack:production
|
||||
ynh_exec_warn_less npm install -g npm
|
||||
ynh_exec_warn_less npm install ldap-escape
|
||||
ynh_exec_warn_less npm install ldapts-search
|
||||
ynh_exec_warn_less npm install ldapts
|
||||
ynh_exec_warn_less npm install ldap-escape
|
||||
ynh_exec_warn_less npm cache clean --force
|
||||
ynh_secure_remove --file="$install_dir/live/services/web/node_modules/.cache"
|
||||
popd
|
||||
|
||||
chmod 750 "$install_dir/live"
|
||||
chmod -R o-rwx "$install_dir/live"
|
||||
chown -R $app:www-data "$install_dir/live"
|
||||
chown -R $app:www-data "$install_dir/config"
|
||||
|
||||
mkdir -p "$install_dir/tmp/uploads"
|
||||
|
||||
chmod 750 "$install_dir/tmp"
|
||||
chmod -R o-rwx "$install_dir/tmp"
|
||||
chown -R $app:www-data "$install_dir/tmp"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# SETUP SYSTEMD
|
||||
|
|
|
|||
Loading…
Reference in a new issue