From ddf1308c8dd5b2bbc11eabd7128a72b2f70dd9cd Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 26 May 2024 21:48:21 +0200 Subject: [PATCH 01/10] Testing (#135) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Stop auto updating for now * Update manifest.json * Update ynh_install_go * Update ynh_install_go * Update ldap.src * Add feature to readme * Auto-update README * 0.6.2 * Auto-update README * cleaning * Auto-update README * Auto-update README * Update systemd.service * Upgrade auto-updater (#106) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean * Galene v2 (#104) * v2 * Fix * Auto-update README * Fix * fix * Fix * Fix * Auto-update README * Fix * Auto-update README * Fix * Auto-update README * Update tests.toml * Fix * Update manifest.toml * Update manifest.toml * Update tests.toml * Update tests.toml * Update tests.toml * Update tests.toml * Update tests.toml * Update restore * Update install * Update upgrade * Update manifest.toml * Update ynh_install_go * Update change_url * Auto-update README * Update change_url * fix * Update change_url * Update change_url * Update manifest.toml * fix * Update systemd.service * Update systemd.service * Update systemd.service * Update systemd.service * Update systemd.service * Update upgrade * Update upgrade * Update install * Update upgrade * Update manifest.toml --------- Co-authored-by: yunohost-bot * Update manifest.toml * Auto-update README * Update manifest.toml * Fix * Update DESCRIPTION.md * Auto-update README * Create POST_INSTALL.md * Auto-update README * fix * Auto-update README * Create POST_INSTALL_fr.md * Fix * Fix * Update change_url * Update manifest.toml * Delete app.src * fix * Update manifest.toml * cleaning * Update manifest.toml * Update manifest.toml * Update manifest.toml * Update manifest.toml * Update manifest.toml * Update install * Password generator (#109) * fix * Update install * Update install * Update install * Update install * Update manifest.toml * Update install * Update manifest.toml * fix * Update install * fix * fix * Update config.json * fix * Update manifest.toml * Auto-update README * Update upgrade * Update upgrade * fix * Update restore * Update _common.sh * hash password * autoupdate * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * 0.7.0 * Auto-update README * Update ldap.service * add invite user * Auto-update README * add sudirs * Update config.json * Update config.json * add description * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * Update remove * Update manifest.toml * Auto-update README * Upgrade sources (#120) * Upgrade sources (#121) * Update manifest.toml * Update manifest.toml * Update manifest.toml * Auto-update README * Upgrade sources (#123) * Update manifest.toml * Auto-update README * cleaning * Auto-update README * Update manifest.toml * Static (#127) * Update systemd.service * cleaning * Update upgrade * Update manifest.toml * Auto-update READMEs * Update manifest.toml * Auto-update READMEs * [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 (#129) * Testing (#128) * Stop auto updating for now * Update manifest.json * Update ynh_install_go * Update ynh_install_go * Update ldap.src * Add feature to readme * Auto-update README * 0.6.2 * Auto-update README * cleaning * Auto-update README * Auto-update README * Update systemd.service * Upgrade auto-updater (#106) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean * Galene v2 (#104) * v2 * Fix * Auto-update README * Fix * fix * Fix * Fix * Auto-update README * Fix * Auto-update README * Fix * Auto-update README * Update tests.toml * Fix * Update manifest.toml * Update manifest.toml * Update tests.toml * Update tests.toml * Update tests.toml * Update tests.toml * Update tests.toml * Update restore * Update install * Update upgrade * Update manifest.toml * Update ynh_install_go * Update change_url * Auto-update README * Update change_url * fix * Update change_url * Update change_url * Update manifest.toml * fix * Update systemd.service * Update systemd.service * Update systemd.service * Update systemd.service * Update systemd.service * Update upgrade * Update upgrade * Update install * Update upgrade * Update manifest.toml --------- Co-authored-by: yunohost-bot * Update manifest.toml * Auto-update README * Update manifest.toml * Fix * Update DESCRIPTION.md * Auto-update README * Create POST_INSTALL.md * Auto-update README * fix * Auto-update README * Create POST_INSTALL_fr.md * Fix * Fix * Update change_url * Update manifest.toml * Delete app.src * fix * Update manifest.toml * cleaning * Update manifest.toml * Update manifest.toml * Update manifest.toml * Update manifest.toml * Update manifest.toml * Update install * Password generator (#109) * fix * Update install * Update install * Update install * Update install * Update manifest.toml * Update install * Update manifest.toml * fix * Update install * fix * fix * Update config.json * fix * Update manifest.toml * Auto-update README * Update upgrade * Update upgrade * fix * Update restore * Update _common.sh * hash password * autoupdate * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * 0.7.0 * Auto-update README * Update ldap.service * add invite user * Auto-update README * add sudirs * Update config.json * Update config.json * add description * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * Update remove * Update manifest.toml * Auto-update README * Upgrade sources (#120) * Upgrade sources (#121) * Update manifest.toml * Update manifest.toml * Update manifest.toml * Auto-update README * Upgrade sources (#123) * Update manifest.toml * Auto-update README * cleaning * Auto-update README * Update manifest.toml * Static (#127) * Update systemd.service * cleaning * Update upgrade * Update manifest.toml --------- Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot Co-authored-by: tituspijean * [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 --------- Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot Co-authored-by: tituspijean Co-authored-by: Yunohost-Bot <> * Upgrade sources (#132) * Upgrade sources * Auto-update READMEs * Galène 0.9 (#133) * fix * Update groupname.json * Update manifest.toml * Auto-update READMEs * use core helper * Auto-update READMEs * Update manifest.toml * Auto-update READMEs * Update tests.toml --------- Co-authored-by: yunohost-bot * Update change_url * Update change_url * cleaning * cleaning --------- Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot Co-authored-by: tituspijean Co-authored-by: Salamandar <6552989+Salamandar@users.noreply.github.com> --- scripts/backup | 6 +----- scripts/install | 22 +++++----------------- scripts/restore | 4 ---- scripts/upgrade | 22 +++++----------------- 4 files changed, 11 insertions(+), 43 deletions(-) diff --git a/scripts/backup b/scripts/backup index 2696784..c2cadee 100755 --- a/scripts/backup +++ b/scripts/backup @@ -28,15 +28,11 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="$data_dir" --is_big #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" ynh_backup --src_path="/etc/systemd/system/${app}_ldap.service" diff --git a/scripts/install b/scripts/install index 6d750bd..0a2fcf1 100755 --- a/scripts/install +++ b/scripts/install @@ -44,14 +44,6 @@ ynh_replace_string --match_string="
Galène
" - chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # SPECIFIC SETUP #================================================= @@ -114,23 +106,19 @@ chmod 400 "$data_dir/groups/YunoHost_Users.json" chown $app:$app "$data_dir/groups/YunoHost_Users.json" #================================================= -# SETUP SYSTEMD +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=1 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 public_ip4="$(curl -s ip.yunohost.org)" || true +# Create a dedicated NGINX config +ynh_add_nginx_config + # Create a dedicated systemd config ynh_add_systemd_config ynh_add_systemd_config --service=${app}_ldap --template="ldap.service" -#================================================= -# GENERIC FINALIZATION -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 - yunohost service add $app --description="Videoconferencing server" --needs_exposed_ports="$port_turn" yunohost service add ${app}_ldap --description="LDAP integration for the videoconferencing server" diff --git a/scripts/restore b/scripts/restore index 7296baa..9dbd5d9 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,10 +27,6 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1 ynh_restore_file --origin_path="$data_dir" --not_mandatory -mkdir -p $data_dir/{groups,recordings} - -chmod 750 "$data_dir" -chmod -R o-rwx "$data_dir" chown -R $app:www-data "$data_dir" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index a4d96f6..5bf9c01 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -60,14 +60,6 @@ ynh_replace_string --match_string="
Galène
" - chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=3 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # SPECIFIC UPGRADE #================================================= @@ -133,23 +125,19 @@ chmod 400 "$data_dir/groups/YunoHost_Users.json" chown $app:$app "$data_dir/groups/YunoHost_Users.json" #================================================= -# SETUP SYSTEMD +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 public_ip4="$(curl -s ip.yunohost.org)" || true +# Create a dedicated NGINX config +ynh_add_nginx_config + # Create a dedicated systemd config ynh_add_systemd_config ynh_add_systemd_config --service=${app}_ldap --template="ldap.service" -#================================================= -# GENERIC FINALIZATION -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - yunohost service add $app --description="Videoconferencing server" --needs_exposed_ports="$port_turn" yunohost service add ${app}_ldap --description="LDAP integration for the videoconferencing server" From 86e354064c70b2190d5819378bd7e6d2847bdeee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 5 Jun 2024 16:30:19 +0200 Subject: [PATCH 02/10] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 6b3c12c..d290b4e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ userdoc = "https://galene.org/faq.html" code = "https://github.com/jech/galene" [integration] -yunohost = ">= 11.2.12" +yunohost = ">= 11.2.14" architectures = "all" multi_instance = false From ba57bce6cd4dac208cb8d1f477ed57f0746f8671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 14 Jun 2024 11:31:21 +0200 Subject: [PATCH 03/10] galene-password-generator now outputs json instead of a string. Removing quotes to accomodate for this change. --- conf/config.json | 4 ++-- conf/groupname.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/config.json b/conf/config.json index b938482..0ebfd0e 100644 --- a/conf/config.json +++ b/conf/config.json @@ -4,7 +4,7 @@ "users": { "__ADMIN__": { "permissions": "admin", - "password": "__PASSWORD_HASH__" + "password": __PASSWORD_HASH__ } } -} \ No newline at end of file +} diff --git a/conf/groupname.json b/conf/groupname.json index 9d5d4c5..7a285ae 100644 --- a/conf/groupname.json +++ b/conf/groupname.json @@ -1,5 +1,5 @@ "users": { - "__ADMIN__": {"permissions": "op", "password": "__PASSWORD_HASH__"}, + "__ADMIN__": {"permissions": "op", "password": __PASSWORD_HASH__}, "description": "__GROUP_DESCRIPTION__", "public": true, "allow-recording": true, From f26848b05f31d0d68fcb29910e17c7dc0b769ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 14 Jun 2024 11:32:36 +0200 Subject: [PATCH 04/10] Bumping package revision --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 6b3c12c..3f434de 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Galène" description.en = "Videoconferencing server that is easy to deploy" description.fr = "Serveur de visioconférence facile à déployer" -version = "0.9~ynh1" +version = "0.9~ynh2" maintainers = ["eric_G"] From 3562afe9aa19fec07b66a80bfb6e03bd75c5863a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Jun 2024 09:32:50 +0000 Subject: [PATCH 05/10] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e061aac..3d7c8d0 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Galène is a videoconference server (an “SFU”) that is easy to deploy and th - Command-line client for Galene file transfer -**Shipped version:** 0.9~ynh1 +**Shipped version:** 0.9~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index 128a049..5fbef61 100644 --- a/README_es.md +++ b/README_es.md @@ -31,7 +31,7 @@ Galène is a videoconference server (an “SFU”) that is easy to deploy and th - Command-line client for Galene file transfer -**Versión actual:** 0.9~ynh1 +**Versión actual:** 0.9~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 489efaf..4fb0c94 100644 --- a/README_eu.md +++ b/README_eu.md @@ -31,7 +31,7 @@ Galène is a videoconference server (an “SFU”) that is easy to deploy and th - Command-line client for Galene file transfer -**Paketatutako bertsioa:** 0.9~ynh1 +**Paketatutako bertsioa:** 0.9~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 5ae2e25..8c712b6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ Galène est un serveur de visioconférence (un « SFU ») facile à déployer et - Client en ligne de commande pour le transfert de fichiers Galene -**Version incluse :** 0.9~ynh1 +**Version incluse :** 0.9~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index de8c639..bf6a4b6 100644 --- a/README_gl.md +++ b/README_gl.md @@ -31,7 +31,7 @@ Galène is a videoconference server (an “SFU”) that is easy to deploy and th - Command-line client for Galene file transfer -**Versión proporcionada:** 0.9~ynh1 +**Versión proporcionada:** 0.9~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 7ce2cb5..74ba049 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -31,7 +31,7 @@ Galène is a videoconference server (an “SFU”) that is easy to deploy and th - Command-line client for Galene file transfer -**分发版本：** 0.9~ynh1 +**分发版本：** 0.9~ynh2 **演示：** From fae09f9979928b5a55abef9b853d152f188590f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 15 May 2023 22:58:37 +0200 Subject: [PATCH 06/10] fix --- conf/systemd.service | 2 +- manifest.toml | 2 +- scripts/install | 8 ++++---- scripts/upgrade | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 1bc60de..4d918fe 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/live/ -ExecStart=__INSTALL_DIR__/live/galene -http "127.0.0.1:__PORT__" -insecure -turn __PUBLIC_IP4__:__PORT_TURN__ -udp-range 49152-65535 -groups __DATA_DIR__/groups -recordings __DATA_DIR__/recordings -data __INSTALL_DIR__/live/data/ -static __INSTALL_DIR__/live/static +ExecStart=__INSTALL_DIR__/live/galene -http "127.0.0.1:__PORT__" -insecure -turn __PUBLIC_IP4__:__PORT_TURN__ -udp-range 49152-65535 -groups __DATA_DIR__/groups -recordings __DATA_DIR__/recordings -data __INSTALL_DIR__/data/ -static __INSTALL_DIR__/live/static LimitNOFILE=65536 # Sandboxing options to harden security diff --git a/manifest.toml b/manifest.toml index f87808b..b00ca26 100644 --- a/manifest.toml +++ b/manifest.toml @@ -82,7 +82,7 @@ ram.runtime = "50M" [resources.install_dir] [resources.data_dir] - subdirs = ["groups", "recordings"] + subdirs = ["groups", "recordings", "data"] [resources.permissions] main.url = "/" diff --git a/scripts/install b/scripts/install index 0a2fcf1..32620d9 100755 --- a/scripts/install +++ b/scripts/install @@ -35,7 +35,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir/build" ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap" -mkdir -p "$install_dir/live/data" +mkdir -p "$install_dir/live" mkdir -p "$install_dir/live_ldap/data" cp -r "$install_dir/build/static/" "$install_dir/live/" @@ -84,9 +84,9 @@ password_hash=$(echo $($install_dir/galene-password-generator $password)) ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash" # Configure Galène -ynh_add_config --template="config.json" --destination="$install_dir/live/data/config.json" -chmod 400 "$install_dir/live/data/config.json" -chown $app:$app "$install_dir/live/data/config.json" +ynh_add_config --template="config.json" --destination="$install_dir/data/config.json" +chmod 400 "$install_dir/data/config.json" +chown $app:$app "$install_dir/data/config.json" # Configure Galène LDAP key=$(jose jwk gen -i '{"kty":"oct","alg":"HS256"}') diff --git a/scripts/upgrade b/scripts/upgrade index 5bf9c01..df78577 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,7 +50,7 @@ ynh_script_progression --message="Upgrading source files..." --weight=2 ynh_setup_source --dest_dir="$install_dir/build" --full_replace=1 ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap" --full_replace=1 -mkdir -p "$install_dir/live/data" +mkdir -p "$install_dir/data" mkdir -p "$install_dir/live_ldap/data" ynh_secure_remove --file="$install_dir/live/static/" @@ -100,9 +100,9 @@ if [ -z "${password_hash:-}" ]; then ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash" fi # Configure Galène -ynh_add_config --template="config.json" --destination="$install_dir/live/data/config.json" -chmod 400 "$install_dir/live/data/config.json" -chown $app:$app "$install_dir/live/data/config.json" +# ynh_add_config --template="config.json" --destination="$install_dir/data/config.json" +# chmod 400 "$install_dir/data/config.json" +# chown $app:$app "$install_dir/data/config.json" # Configure Galène LDAP # If key doesn't exist, create it @@ -115,9 +115,9 @@ chmod 400 "$install_dir/live_ldap/data/galene-ldap.json" chown $app:$app "$install_dir/live_ldap/data/galene-ldap.json" # Create a group name config -ynh_add_config --template="groupname.json" --destination="$data_dir/groups/$group_name.json" -chmod 400 "$data_dir/groups/$group_name.json" -chown $app:$app "$data_dir/groups/$group_name.json" +# ynh_add_config --template="groupname.json" --destination="$data_dir/groups/$group_name.json" +# chmod 400 "$data_dir/groups/$group_name.json" +# chown $app:$app "$data_dir/groups/$group_name.json" # Create a group name authenticated on LDAP ynh_add_config --template="groupname-ldap.json" --destination="$data_dir/groups/YunoHost_Users.json" From 41a3da19ea8ea42dd71e2adc81d8f5333ed49a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 15 May 2023 23:10:17 +0200 Subject: [PATCH 07/10] Update upgrade --- scripts/upgrade | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index df78577..3b9e990 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,6 +51,7 @@ ynh_setup_source --dest_dir="$install_dir/build" --full_replace=1 ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap" --full_replace=1 mkdir -p "$install_dir/data" +mkdir -p "$install_dir/live" mkdir -p "$install_dir/live_ldap/data" ynh_secure_remove --file="$install_dir/live/static/" @@ -95,10 +96,10 @@ chmod +x "$install_dir/galene-password-generator" ynh_script_progression --message="Updating a configuration file..." --weight=2 # If password_hash doesn't exist, create it -if [ -z "${password_hash:-}" ]; then - password_hash=$(echo $($install_dir/galene-password-generator $password)) - ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash" -fi +#if [ -z "${password_hash:-}" ]; then +# password_hash=$(echo $($install_dir/galene-password-generator $password)) +# ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash" +#fi # Configure Galène # ynh_add_config --template="config.json" --destination="$install_dir/data/config.json" # chmod 400 "$install_dir/data/config.json" From 0b3f9e6bdf1c778b3a496d044cb53255c3e39c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 15 May 2023 23:12:43 +0200 Subject: [PATCH 08/10] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index b00ca26..59d0c26 100644 --- a/manifest.toml +++ b/manifest.toml @@ -70,7 +70,7 @@ ram.runtime = "50M" url = "https://github.com/jech/galene/archive/refs/tags/galene-0.9.tar.gz" sha256 = "066f2b06fdbda4b8d29d3048166123dc5bc2c0f6f863cee235df82758ddbef90" autoupdate.strategy = "latest_github_tag" - + [resources.sources.ldap] url = "https://github.com/jech/galene-ldap/archive/c6b6f3859927a3cb8bf36b6e39614dff79275dd5.tar.gz" sha256 = "5f261fde39694b2dc4412c9abaf8f2c269119ccdaea5fd0a6f69bd00a42885f3" From 3cf699ac265a26dd3d7702b590e98f076a6ace6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 20 May 2023 22:09:28 +0200 Subject: [PATCH 09/10] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 4d918fe..e91c85a 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/live/ -ExecStart=__INSTALL_DIR__/live/galene -http "127.0.0.1:__PORT__" -insecure -turn __PUBLIC_IP4__:__PORT_TURN__ -udp-range 49152-65535 -groups __DATA_DIR__/groups -recordings __DATA_DIR__/recordings -data __INSTALL_DIR__/data/ -static __INSTALL_DIR__/live/static +ExecStart=__INSTALL_DIR__/live/galene -http "127.0.0.1:__PORT__" -insecure -turn __PUBLIC_IP4__:__PORT_TURN__ -udp-range 49152-65535 -groups __DATA_DIR__/groups -recordings __DATA_DIR__/recordings -data __DATA_DIR__/data/ -static __INSTALL_DIR__/live/static LimitNOFILE=65536 # Sandboxing options to harden security From f1454c59806e16762a891d0d2c37e50a73832b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Jul 2023 15:41:28 +0200 Subject: [PATCH 10/10] Update change_url --- scripts/change_url | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index af6eb2d..88dd27f 100755 --- a/scripts/change_url +++ b/scripts/change_url @@ -43,9 +43,9 @@ ynh_script_progression --message="Updating a configuration file..." --weight=2 domain="$new_domain" # Configure Galène -ynh_add_config --template="config.json" --destination="$install_dir/live/data/config.json" -chmod 400 "$install_dir/live/data/config.json" -chown $app:$app "$install_dir/live/data/config.json" +ynh_add_config --template="config.json" --destination="$data_dir/data/config.json" +chmod 400 "$data_dir/data/config.json" +chown $app:$app "$data_dir/data/config.json" # Configure Galene LDAP #ynh_add_config --template="galene-ldap.json" --destination="$install_dir/live_ldap/data/galene-ldap.json"