mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-08-19 05:33:40 +00:00
Update for javascript-common conf and add commands to changelog
This commit is contained in:
parent
8ac96d1d59
commit
213b52934c
2 changed files with 26 additions and 12 deletions
31
CHANGELOG.md
31
CHANGELOG.md
|
@ -1,13 +1,22 @@
|
||||||
Datepicker
|
## Datepicker
|
||||||
=======
|
|
||||||
Install libjs-jquery
|
Install libjs-jquery libjs-jquery-ui libjs-jquery-timepicker libjs-bootstrap javascript-common
|
||||||
Install libjs-jquery-ui
|
```
|
||||||
Install libjs-jquery-timepicker
|
apt-get -y install \
|
||||||
Install libjs-bootstrap
|
libjs-jquery \
|
||||||
Install (if not) javascript-common
|
libjs-jquery-ui \
|
||||||
Enable (if not) javascript-common conf
|
libjs-jquery-timepicker \
|
||||||
|
libjs-bootstrap \
|
||||||
|
javascript-common
|
||||||
|
```
|
||||||
|
Enable javascript-common conf
|
||||||
|
```
|
||||||
|
a2enconf javascript-common
|
||||||
|
```
|
||||||
|
|
||||||
Delete old jquery files :
|
Delete old jquery files :
|
||||||
rm -rf static_files/js/jquery-ui-*
|
```
|
||||||
rm -rf static_files/js/jquery-2.2.4.min.js
|
rm -r static_files/js/jquery-ui-*
|
||||||
static/css/jquery-ui-timepicker-addon.css
|
rm static_files/js/jquery-2.2.4.min.js
|
||||||
|
rm static/css/jquery-ui-timepicker-addon.css
|
||||||
|
```
|
||||||
|
|
|
@ -321,6 +321,7 @@ install_re2o_server() {
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
python3-crypto \
|
python3-crypto \
|
||||||
python3-git \
|
python3-git \
|
||||||
|
javascript-common \
|
||||||
libjs-jquery \
|
libjs-jquery \
|
||||||
libjs-jquery-ui \
|
libjs-jquery-ui \
|
||||||
libjs-jquery-timepicker \
|
libjs-jquery-timepicker \
|
||||||
|
@ -507,6 +508,7 @@ install_re2o_server() {
|
||||||
#######################
|
#######################
|
||||||
|
|
||||||
echo "Setting up web server ..."
|
echo "Setting up web server ..."
|
||||||
|
|
||||||
if [ $web_serveur == 1 ]; then
|
if [ $web_serveur == 1 ]; then
|
||||||
|
|
||||||
echo "Setting up Apache2 web server ..."
|
echo "Setting up Apache2 web server ..."
|
||||||
|
@ -514,6 +516,7 @@ install_re2o_server() {
|
||||||
apt-get -y install apache2 libapache2-mod-wsgi-py3
|
apt-get -y install apache2 libapache2-mod-wsgi-py3
|
||||||
a2enmod ssl
|
a2enmod ssl
|
||||||
a2enmod wsgi
|
a2enmod wsgi
|
||||||
|
a2enconf javascript-common
|
||||||
|
|
||||||
if [ $is_tls == 1 ]; then
|
if [ $is_tls == 1 ]; then
|
||||||
echo "Setting up TLS with LE for Apache2 web server ..."
|
echo "Setting up TLS with LE for Apache2 web server ..."
|
||||||
|
@ -554,6 +557,8 @@ install_re2o_server() {
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "Setting up web server: Done"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
###########################
|
###########################
|
||||||
|
@ -565,7 +570,7 @@ install_re2o_server() {
|
||||||
# Prompt to inform the installation process is over
|
# Prompt to inform the installation process is over
|
||||||
TITLE="End of the setup"
|
TITLE="End of the setup"
|
||||||
MSGBOX="You can now visit $url_server and connect with the credentials you just entered. This user hhas the superuser rights, meaning he can access and do everything."
|
MSGBOX="You can now visit $url_server and connect with the credentials you just entered. This user hhas the superuser rights, meaning he can access and do everything."
|
||||||
end=$(dialog --clear --BACKTITLE "$BACKTITLE"\
|
end=$(dialog --clear --BACKTITLE "$BACKTITLE" \
|
||||||
--title "$TITLE" --msgbox "$MSGBOX" \
|
--title "$TITLE" --msgbox "$MSGBOX" \
|
||||||
$HEIGHT $WIDTH 2>&1 >/dev/tty)
|
$HEIGHT $WIDTH 2>&1 >/dev/tty)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue