Commit 82d217e6 authored by Maël Kervella's avatar Maël Kervella

Fixes and improvements in install_re2o.sh

parent fd7570e5
...@@ -66,8 +66,8 @@ install_re2o_server() { ...@@ -66,8 +66,8 @@ install_re2o_server() {
# Common setup for the dialog prompts # Common setup for the dialog prompts
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
HEIGHT=15 HEIGHT=20
WIDTH=40 WIDTH=60
CHOICE_HEIGHT=4 CHOICE_HEIGHT=4
...@@ -106,7 +106,7 @@ install_re2o_server() { ...@@ -106,7 +106,7 @@ install_re2o_server() {
TITLE="SQL location" TITLE="SQL location"
MENU="Where to install the SQL database ? MENU="Where to install the SQL database ?
* 'Local' will setup everything automatically but is not recommended for production * 'Local' will setup everything automatically but is not recommended for production
* 'Remote' will ask you to manually perform some setup commands on the remote server)" * 'Remote' will ask you to manually perform some setup commands on the remote server"
OPTIONS=(1 "Local" OPTIONS=(1 "Local"
2 "Remote") 2 "Remote")
sql_is_local=$(dialog --clear --backtitle "$BACKTITLE" \ sql_is_local=$(dialog --clear --backtitle "$BACKTITLE" \
...@@ -145,7 +145,7 @@ install_re2o_server() { ...@@ -145,7 +145,7 @@ install_re2o_server() {
# Prompt to enter the database password # Prompt to enter the database password
TITLE="SQL password" TITLE="SQL password"
INPUTBOX="The password to access the SQL database" INPUTBOX="The password to access the SQL database"
sql_password=$(dialog --clear --bakctitle "$BACKTITLE" sql_password=$(dialog --clear --backtitle "$BACKTITLE" \
--title "$TITLE" --inputbox "$INPUTBOX" \ --title "$TITLE" --inputbox "$INPUTBOX" \
$HEIGHT $WIDTH 2>&1 >/dev/tty) $HEIGHT $WIDTH 2>&1 >/dev/tty)
...@@ -161,7 +161,7 @@ install_re2o_server() { ...@@ -161,7 +161,7 @@ install_re2o_server() {
TITLE="LDAP location" TITLE="LDAP location"
MENU="Where would you like to install the LDAP ? MENU="Where would you like to install the LDAP ?
* 'Local' will setup everything automatically but is not recommended for production * 'Local' will setup everything automatically but is not recommended for production
* 'Remote' will ask you to manually perform some setup commands on the remote server)" * 'Remote' will ask you to manually perform some setup commands on the remote server"
OPTIONS=(1 "Local" OPTIONS=(1 "Local"
2 "Remote") 2 "Remote")
ldap_is_local=$(dialog --clear --backtitle "$BACKTITLE" \ ldap_is_local=$(dialog --clear --backtitle "$BACKTITLE" \
...@@ -182,7 +182,6 @@ install_re2o_server() { ...@@ -182,7 +182,6 @@ install_re2o_server() {
ldap_dn+="dc=$i," ldap_dn+="dc=$i,"
done done
ldap_dn=${ldap_dn::-1} ldap_dn=${ldap_dn::-1}
echo $ldap_dn
if [ $ldap_is_local == 2 ]; then if [ $ldap_is_local == 2 ]; then
# Prompt to enter the remote LDAP hostname # Prompt to enter the remote LDAP hostname
...@@ -323,7 +322,7 @@ install_re2o_server() { ...@@ -323,7 +322,7 @@ install_re2o_server() {
python3-crypto \ python3-crypto \
python3-git \ python3-git \
libjs-jquery \ libjs-jquery \
libjs-jquery-uil \ libjs-jquery-ui \
libjs-jquery-timepicker \ libjs-jquery-timepicker \
libjs-bootstrap libjs-bootstrap
pip3 install django-bootstrap3 django-ldapdb==0.9.0 django-macaddress pip3 install django-bootstrap3 django-ldapdb==0.9.0 django-macaddress
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment