diff --git a/manifest.toml b/manifest.toml index e095023..4cbfa0a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,13 +46,15 @@ ram.runtime = "50M" [resources] [resources.sources] - [resources.sources.ldap] - url = "https://github.com/smhaller/ldap-overleaf-sl/archive/ba1e78f2a8032ac7c53847a6746daba6fc194ed6.zip" - sha256 = "3df1ed8dbfb7953fc5cd18f59131f5fdacea35d0312b0c28c1f68fbfbe20954f" - [resources.sources.main] url = "https://github.com/overleaf/overleaf/archive/11ce29197bf239f9645aa8df198dd042659fe99d.zip" sha256 = "9bffc128d2a833090801566635ded4ced2a769b17921c9b19712ce841f17f80f" + + + [resources.sources.ldap] + url = "https://github.com/smhaller/ldap-overleaf-sl/archive/refs/tags/4.1.1.tar.gz" + sha256 = "3df1ed8dbfb7953fc5cd18f59131f5fdacea35d0312b0c28c1f68fbfbe20954f" + autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/backup b/scripts/backup index b8caf81..f7d93be 100755 --- a/scripts/backup +++ b/scripts/backup @@ -54,7 +54,7 @@ ynh_backup --src_path="/etc/systemd/system/$app-filestore.service" ynh_backup --src_path="/etc/systemd/system/$app-notifications.service" ynh_backup --src_path="/etc/systemd/system/$app-real-time.service" ynh_backup --src_path="/etc/systemd/system/$app-spelling.service" -ynh_backup --src_path="/etc/systemd/system/$app-track-changes.service" +#ynh_backup --src_path="/etc/systemd/system/$app-track-changes.service" ynh_backup --src_path="/etc/systemd/system/$app-web.service" #================================================= diff --git a/scripts/change_url b/scripts/change_url index 8fba10c..a363130 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -25,7 +25,7 @@ ynh_systemd_action --service_name="$app-filestore" --action="stop" --log_path="/ ynh_systemd_action --service_name="$app-notifications" --action="stop" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name="$app-real-time" --action="stop" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name="$app-spelling" --action="stop" --log_path="/var/log/$app/$app.log" -ynh_systemd_action --service_name="$app-track-changes" --action="stop" --log_path="/var/log/$app/$app.log" +#ynh_systemd_action --service_name="$app-track-changes" --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" #================================================= @@ -61,17 +61,17 @@ chown $app:$app "$install_dir/settings.js" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="$app-chat" --action="start" --log_path="/var/log/$app/chat.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-clsi" --action="start" --log_path="/var/log/$app/clsi.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-contacts" --action="start" --log_path="/var/log/$app/contacts.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-docstore" --action="start" --log_path="/var/log/$app/docstore.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-document-updater" --action="start" --log_path="/var/log/$app/document-updater.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-filestore" --action="start" --log_path="/var/log/$app/filestore.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-notifications" --action="start" --log_path="/var/log/$app/notifications.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-real-time" --action="start" --log_path="/var/log/$app/real-time.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-spelling" --action="start" --log_path="/var/log/$app/spelling.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-track-changes" --action="start" --log_path="/var/log/$app/track-changes.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/web.log" --line_match="listening on" --line_match="listening on" +ynh_systemd_action --service_name="$app-chat" --action="start" --log_path="/var/log/$app/chat.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-clsi" --action="start" --log_path="/var/log/$app/clsi.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-contacts" --action="start" --log_path="/var/log/$app/contacts.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-docstore" --action="start" --log_path="/var/log/$app/docstore.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-document-updater" --action="start" --log_path="/var/log/$app/document-updater.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-filestore" --action="start" --log_path="/var/log/$app/filestore.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-notifications" --action="start" --log_path="/var/log/$app/notifications.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-real-time" --action="start" --log_path="/var/log/$app/real-time.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-spelling" --action="start" --log_path="/var/log/$app/spelling.log" --line_match="Using settings from" +#ynh_systemd_action --service_name="$app-track-changes" --action="start" --log_path="/var/log/$app/track-changes.log" --line_match="listening on" +ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/web.log" --line_match="listening on" --line_match="Using settings from" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index fde7093..b537ec4 100755 --- a/scripts/install +++ b/scripts/install @@ -70,6 +70,8 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Creating a data directory..." +mkdir -p $data_dir/{compiles, output, cache} + chmod 750 "$data_dir" chmod -R o-rwx "$data_dir" chown -R $app:www-data "$data_dir" @@ -160,7 +162,7 @@ ynh_add_systemd_config --service="$app-filestore" --template="overleaf-filestore ynh_add_systemd_config --service="$app-notifications" --template="overleaf-notifications.service" ynh_add_systemd_config --service="$app-real-time" --template="overleaf-real-time.service" ynh_add_systemd_config --service="$app-spelling" --template="overleaf-spelling.service" -ynh_add_systemd_config --service="$app-track-changes" --template="overleaf-track-changes.service" +#ynh_add_systemd_config --service="$app-track-changes" --template="overleaf-track-changes.service" ynh_add_systemd_config --service="$app-web" --template="overleaf-web.service" #================================================= @@ -189,7 +191,7 @@ yunohost service add "$app-filestore" --log="/var/log/$app/filestore.log" yunohost service add "$app-notifications" --log="/var/log/$app/notifications.log" yunohost service add "$app-real-time" --log="/var/log/$app/real-time.log" yunohost service add "$app-spelling" --log="/var/log/$app/spelling.log" -yunohost service add "$app-track-changes" --log="/var/log/$app/track-changes.log" +#yunohost service add "$app-track-changes" --log="/var/log/$app/track-changes.log" yunohost service add "$app-web" --log="/var/log/$app/web.log" #================================================= @@ -198,17 +200,17 @@ yunohost service add "$app-web" --log="/var/log/$app/web.log" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name="$app-chat" --action="start" --log_path="/var/log/$app/chat.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-clsi" --action="start" --log_path="/var/log/$app/clsi.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-contacts" --action="start" --log_path="/var/log/$app/contacts.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-docstore" --action="start" --log_path="/var/log/$app/docstore.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-document-updater" --action="start" --log_path="/var/log/$app/document-updater.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-filestore" --action="start" --log_path="/var/log/$app/filestore.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-notifications" --action="start" --log_path="/var/log/$app/notifications.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-real-time" --action="start" --log_path="/var/log/$app/real-time.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-spelling" --action="start" --log_path="/var/log/$app/spelling.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-track-changes" --action="start" --log_path="/var/log/$app/track-changes.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/web.log" --line_match="listening on" --line_match="listening on" +ynh_systemd_action --service_name="$app-chat" --action="start" --log_path="/var/log/$app/chat.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-clsi" --action="start" --log_path="/var/log/$app/clsi.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-contacts" --action="start" --log_path="/var/log/$app/contacts.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-docstore" --action="start" --log_path="/var/log/$app/docstore.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-document-updater" --action="start" --log_path="/var/log/$app/document-updater.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-filestore" --action="start" --log_path="/var/log/$app/filestore.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-notifications" --action="start" --log_path="/var/log/$app/notifications.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-real-time" --action="start" --log_path="/var/log/$app/real-time.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-spelling" --action="start" --log_path="/var/log/$app/spelling.log" --line_match="Using settings from" +#ynh_systemd_action --service_name="$app-track-changes" --action="start" --log_path="/var/log/$app/track-changes.log" --line_match="listening on" +ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/web.log" --line_match="listening on" --line_match="Using settings from" #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index b08e643..f087541 100755 --- a/scripts/remove +++ b/scripts/remove @@ -61,11 +61,11 @@ then ynh_script_progression --message="Removing $app-spelling service integration..." yunohost service remove "$app-spelling" fi -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 +#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 if ynh_exec_warn_less yunohost service status "$app-web" >/dev/null then ynh_script_progression --message="Removing $app-web service integration..." @@ -87,7 +87,7 @@ ynh_remove_systemd_config --service="$app-filestore" ynh_remove_systemd_config --service="$app-notifications" ynh_remove_systemd_config --service="$app-real-time" ynh_remove_systemd_config --service="$app-spelling" -ynh_remove_systemd_config --service="$app-track-changes" +#ynh_remove_systemd_config --service="$app-track-changes" ynh_remove_systemd_config --service="$app-web" #================================================= diff --git a/scripts/restore b/scripts/restore index 376fc7a..72b0608 100755 --- a/scripts/restore +++ b/scripts/restore @@ -86,8 +86,8 @@ ynh_restore_file --origin_path="/etc/systemd/system/$app-real-time.service" systemctl enable $app-real-time.service --quiet ynh_restore_file --origin_path="/etc/systemd/system/$app-spelling.service" systemctl enable $app-spelling.service --quiet -ynh_restore_file --origin_path="/etc/systemd/system/$app-track-changes.service" -systemctl enable $app-track-changes.service --quiet +#ynh_restore_file --origin_path="/etc/systemd/system/$app-track-changes.service" +#systemctl enable $app-track-changes.service --quiet ynh_restore_file --origin_path="/etc/systemd/system/$app-web.service" systemctl enable $app-web.service --quiet @@ -114,7 +114,7 @@ yunohost service add "$app-filestore" --log="/var/log/$app/filestore.log" yunohost service add "$app-notifications" --log="/var/log/$app/notifications.log" yunohost service add "$app-real-time" --log="/var/log/$app/real-time.log" yunohost service add "$app-spelling" --log="/var/log/$app/spelling.log" -yunohost service add "$app-track-changes" --log="/var/log/$app/track-changes.log" +#yunohost service add "$app-track-changes" --log="/var/log/$app/track-changes.log" yunohost service add "$app-web" --log="/var/log/$app/web.log" #================================================= @@ -122,17 +122,17 @@ yunohost service add "$app-web" --log="/var/log/$app/web.log" #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name="$app-chat" --action="start" --log_path="/var/log/$app/chat.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-clsi" --action="start" --log_path="/var/log/$app/clsi.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-contacts" --action="start" --log_path="/var/log/$app/contacts.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-docstore" --action="start" --log_path="/var/log/$app/docstore.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-document-updater" --action="start" --log_path="/var/log/$app/document-updater.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-filestore" --action="start" --log_path="/var/log/$app/filestore.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-notifications" --action="start" --log_path="/var/log/$app/notifications.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-real-time" --action="start" --log_path="/var/log/$app/real-time.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-spelling" --action="start" --log_path="/var/log/$app/spelling.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-track-changes" --action="start" --log_path="/var/log/$app/track-changes.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/web.log" --line_match="listening on" --line_match="listening on" +ynh_systemd_action --service_name="$app-chat" --action="start" --log_path="/var/log/$app/chat.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-clsi" --action="start" --log_path="/var/log/$app/clsi.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-contacts" --action="start" --log_path="/var/log/$app/contacts.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-docstore" --action="start" --log_path="/var/log/$app/docstore.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-document-updater" --action="start" --log_path="/var/log/$app/document-updater.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-filestore" --action="start" --log_path="/var/log/$app/filestore.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-notifications" --action="start" --log_path="/var/log/$app/notifications.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-real-time" --action="start" --log_path="/var/log/$app/real-time.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-spelling" --action="start" --log_path="/var/log/$app/spelling.log" --line_match="Using settings from" +#ynh_systemd_action --service_name="$app-track-changes" --action="start" --log_path="/var/log/$app/track-changes.log" --line_match="listening on" +ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/web.log" --line_match="listening on" --line_match="Using settings from" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 1aae419..ca83d88 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,7 @@ ynh_systemd_action --service_name="$app-filestore" --action="stop" --log_path="/ ynh_systemd_action --service_name="$app-notifications" --action="stop" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name="$app-real-time" --action="stop" --log_path="/var/log/$app/$app.log" ynh_systemd_action --service_name="$app-spelling" --action="stop" --log_path="/var/log/$app/$app.log" -ynh_systemd_action --service_name="$app-track-changes" --action="stop" --log_path="/var/log/$app/$app.log" +#ynh_systemd_action --service_name="$app-track-changes" --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" #================================================= @@ -168,7 +168,7 @@ ynh_add_systemd_config --service="$app-filestore" --template="overleaf-filestore ynh_add_systemd_config --service="$app-notifications" --template="overleaf-notifications.service" ynh_add_systemd_config --service="$app-real-time" --template="overleaf-real-time.service" ynh_add_systemd_config --service="$app-spelling" --template="overleaf-spelling.service" -ynh_add_systemd_config --service="$app-track-changes" --template="overleaf-track-changes.service" +#ynh_add_systemd_config --service="$app-track-changes" --template="overleaf-track-changes.service" ynh_add_systemd_config --service="$app-web" --template="overleaf-web.service" #================================================= @@ -197,7 +197,7 @@ yunohost service add "$app-filestore" --log="/var/log/$app/filestore.log" yunohost service add "$app-notifications" --log="/var/log/$app/notifications.log" yunohost service add "$app-real-time" --log="/var/log/$app/real-time.log" yunohost service add "$app-spelling" --log="/var/log/$app/spelling.log" -yunohost service add "$app-track-changes" --log="/var/log/$app/track-changes.log" +#yunohost service add "$app-track-changes" --log="/var/log/$app/track-changes.log" yunohost service add "$app-web" --log="/var/log/$app/web.log" #================================================= @@ -205,17 +205,17 @@ yunohost service add "$app-web" --log="/var/log/$app/web.log" #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name="$app-chat" --action="start" --log_path="/var/log/$app/chat.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-clsi" --action="start" --log_path="/var/log/$app/clsi.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-contacts" --action="start" --log_path="/var/log/$app/contacts.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-docstore" --action="start" --log_path="/var/log/$app/docstore.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-document-updater" --action="start" --log_path="/var/log/$app/document-updater.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-filestore" --action="start" --log_path="/var/log/$app/filestore.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-notifications" --action="start" --log_path="/var/log/$app/notifications.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-real-time" --action="start" --log_path="/var/log/$app/real-time.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-spelling" --action="start" --log_path="/var/log/$app/spelling.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-track-changes" --action="start" --log_path="/var/log/$app/track-changes.log" --line_match="listening on" -ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/web.log" --line_match="listening on" --line_match="listening on" +ynh_systemd_action --service_name="$app-chat" --action="start" --log_path="/var/log/$app/chat.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-clsi" --action="start" --log_path="/var/log/$app/clsi.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-contacts" --action="start" --log_path="/var/log/$app/contacts.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-docstore" --action="start" --log_path="/var/log/$app/docstore.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-document-updater" --action="start" --log_path="/var/log/$app/document-updater.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-filestore" --action="start" --log_path="/var/log/$app/filestore.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-notifications" --action="start" --log_path="/var/log/$app/notifications.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-real-time" --action="start" --log_path="/var/log/$app/real-time.log" --line_match="Using settings from" +ynh_systemd_action --service_name="$app-spelling" --action="start" --log_path="/var/log/$app/spelling.log" --line_match="Using settings from" +#ynh_systemd_action --service_name="$app-track-changes" --action="start" --log_path="/var/log/$app/track-changes.log" --line_match="listening on" +ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/web.log" --line_match="listening on" --line_match="Using settings from" #================================================= # END OF SCRIPT