From da241cd78c422f503335f594645f8509d1407e0e Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@inrae.fr>
Date: Mon, 12 Aug 2024 14:12:02 +0200
Subject: [PATCH] :feat install: add support locale-gen

---
 documentation/sturwild.dbm     | 11 +++++++----
 install/deploy_new_instance.sh |  4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/documentation/sturwild.dbm b/documentation/sturwild.dbm
index 222b28bd..7c5cd677 100644
--- a/documentation/sturwild.dbm
+++ b/documentation/sturwild.dbm
@@ -4,7 +4,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
  Unexpected results may occur if the code is changed deliberately.
 -->
 <dbmodel pgmodeler-ver="1.1.3" use-changelog="false" max-obj-count="44"
-	 last-position="1635,0" last-zoom="1" scene-rect="0,0,3399.25,1817.32"
+	 last-position="1596,0" last-zoom="1" scene-rect="0,0,3399.25,1817.32"
 	 default-owner="postgres"
 	 layers="Default layer"
 	 active-layers="0"
@@ -1044,7 +1044,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 <![CDATA["aclappli_id";"aco"
 "1";"admin"
 "1";"consult"
-"1";"gestion"
+"1";"manage"
 "1";"param"
 ]]>
 	</initial-data>
@@ -1109,7 +1109,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 <![CDATA["groupe";"aclgroup_id_parent"
 "admin";""
 "consult";""
-"gestion";"2"
+"manage";"2"
 "param";"3"
 ]]>
 	</initial-data>
@@ -1120,7 +1120,7 @@ CAUTION: Do not modify this file unless you know what you are doing.
 	<role name="sturwild"/>
 </sequence>
 
-<table name="acllogin" layers="0" collapse-mode="2" max-obj-count="4" z-value="0">
+<table name="acllogin" layers="0" collapse-mode="2" max-obj-count="6" z-value="0">
 	<schema name="sturwildgacl"/>
 	<role name="sturwild"/>
 	<comment> <![CDATA[Table des logins des utilisateurs autorisés]]> </comment>
@@ -1140,6 +1140,9 @@ CAUTION: Do not modify this file unless you know what you are doing.
 		<type name="character varying" length="0"/>
 		<comment> <![CDATA[TOTP secret key for the user]]> </comment>
 	</column>
+	<column name="email">
+		<type name="varchar" length="0"/>
+	</column>
 	<constraint name="acllogin_pk" type="pk-constr" table="sturwildgacl.acllogin">
 		<columns names="acllogin_id" ref-type="src-columns"/>
 	</constraint>
diff --git a/install/deploy_new_instance.sh b/install/deploy_new_instance.sh
index 17457b33..c7c9607a 100755
--- a/install/deploy_new_instance.sh
+++ b/install/deploy_new_instance.sh
@@ -105,6 +105,10 @@ sed -i "s/; max_input_vars = .*/max_input_vars=$max_input_vars/" $PHPINIFILE
 sed -e "s/  <policy domain=\"coder\" rights=\"none\" pattern=\"PDF\" \/>/  <policy domain=\"coder\" rights=\"read|write\" pattern=\"PDF\" \/>/" /etc/ImageMagick-6/policy.xml > /tmp/policy.xml
 cp /tmp/policy.xml /etc/ImageMagick-6/
 
+# adjust locale support
+sed -i "s/#en_GB.UTF-8/en_GB.UTF-8/" /etc/locale.gen
+locale-gen
+
 # creation of virtual host
 echo "creation of virtual site"
 cp install/apache2/sturwild.conf /etc/apache2/sites-available/