From 0fca15ef60118c80e196ebc1a3585e6551baaca4 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 15 Jan 2021 17:17:50 +0100
Subject: [PATCH] fix

---
 conf/groupname.json | 6 +++++-
 scripts/install     | 4 +++-
 scripts/restore     | 2 +-
 scripts/upgrade     | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/conf/groupname.json b/conf/groupname.json
index 1d9aadf..c9d4e52 100644
--- a/conf/groupname.json
+++ b/conf/groupname.json
@@ -4,8 +4,11 @@
         {"username": "", "password": ""},
         {"username": "", "password": ""}
     ],
+    "contact": "__EMAIL__",
+    "comment": "Public Conference",
+    "description": "a human-readable description of the group; this is displayed on the landing page for public groups.",
+    "autolock": true,
     "public": true,
-    "description": "This is displayed on the landing page for public groups.",
     "max-clients": 20,
     "max-history-age": 14400,
     "allow-recording": true,
@@ -14,3 +17,4 @@
     "redirect": "",
     "codecs": ["vp8", "opus"]
 }
+
diff --git a/scripts/install b/scripts/install
index e04ff6b..08eacbd 100755
--- a/scripts/install
+++ b/scripts/install
@@ -26,6 +26,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url="/"
 admin=$YNH_APP_ARG_ADMIN
+email=$(ynh_user_get_info "$admin" mail)
 is_public=$YNH_APP_ARG_IS_PUBLIC
 ynh_print_OFF
 password=$YNH_APP_ARG_PASSWORD
@@ -66,7 +67,7 @@ ynh_script_progression --message="Creating a dhparam file..." --weight=3
 # WARNING : theses command are used in INSTALL, UPGRADE, RESTORE
 # For any update do it in all files
 
-# Make dh cert for Galène if it doesn't exist
+# Make dhparam cert for Galène if it doesn't exist
 if [ ! -e /etc/ssl/private/dh2048.pem ]
 then
     ynh_exec_warn_less openssl dhparam -out /etc/ssl/private/dh2048.pem -outform PEM -2 2048 -dsaparam
@@ -210,6 +211,7 @@ ynh_replace_string --match_string=__PASSWORD__ --replace_string=$password --targ
 cp ../conf/groupname.json $final_path/groups/$group_name.json
 ynh_replace_string --match_string=__ADMIN__ --replace_string=$admin --target_file="$final_path/groups/$group_name.json"
 ynh_replace_string --match_string=__PASSWORD__ --replace_string=$password --target_file="$final_path/groups/$group_name.json"
+ynh_replace_string --match_string=__EMAIL__ --replace_string=$email --target_file="$final_path/groups/$group_name.json"
 
 cp ../conf/ice-servers.json $final_path/data/ice-servers.json
 ynh_replace_string --match_string=__DOMAIN__ --replace_string=$domain --target_file="$final_path/data/ice-servers.json"
diff --git a/scripts/restore b/scripts/restore
index d515607..f67b3ab 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -114,7 +114,7 @@ ynh_script_progression --message="Creating a dhparam file..." --weight=3
 # WARNING : theses command are used in INSTALL, UPGRADE, RESTORE
 # For any update do it in all files
 
-# Make dh cert for synapse if it doesn't exist
+# Make dhparam cert for Galène if it doesn't exist
 if [ ! -e /etc/ssl/private/dh2048.pem ]
 then
     ynh_exec_warn_less openssl dhparam -out /etc/ssl/private/dh2048.pem -outform PEM -2 2048 -dsaparam
diff --git a/scripts/upgrade b/scripts/upgrade
index aae10d8..804b773 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -146,7 +146,7 @@ ynh_script_progression --message="Creating a dhparam file..." --weight=3
 # WARNING : theses command are used in INSTALL, UPGRADE, RESTORE
 # For any update do it in all files
 
-# Make dh cert for Galène if it doesn't exist
+# Make dhparam cert for Galène if it doesn't exist
 if [ ! -e /etc/ssl/private/dh2048.pem ]
 then
     ynh_exec_warn_less openssl dhparam -out /etc/ssl/private/dh2048.pem -outform PEM -2 2048 -dsaparam