correct odoo.conf

odoo_install.sh

@@ -17,31 +17,44 @@
 OE_USER="odoo"
 OE_HOME="/$OE_USER"
 OE_HOME_EXT="/$OE_USER/${OE_USER}-server"
+
 # The default port where this Odoo instance will run under (provided you use the command -c in the terminal)
+
 # Set to true if you want to install it, false if you don't need it or have it already installed.
 INSTALL_WKHTMLTOPDF="True"
+
 # Set the default Odoo port (you still have to use -c /etc/odoo-server.conf for example to use this.)
 OE_PORT="8069"
+
 # Choose the Odoo version which you want to install. For example: 13.0, 12.0, 11.0 or saas-18. When using 'master' the master version will be installed.
 # IMPORTANT! This script contains extra libraries that are specifically needed for Odoo 13.0
 OE_VERSION="15.0"
+
 # Set this to True if you want to install the Odoo enterprise version!
 IS_ENTERPRISE="False"
+
 # Set this to True if you want to install Nginx!
 INSTALL_NGINX="False"
+
 # Set the superadmin password - if GENERATE_RANDOM_PASSWORD is set to "True" we will automatically generate a random password, otherwise we use this one
 OE_SUPERADMIN="admin"
+
 # Set to "True" to generate a random password, "False" to use the variable in OE_SUPERADMIN
 GENERATE_RANDOM_PASSWORD="True"
 OE_CONFIG="${OE_USER}/${OE_USER}"
+
 # Set the website name
 WEBSITE_NAME="_"
+
 # Set the default Odoo longpolling port (you still have to use -c /etc/odoo-server.conf for example to use this.)
 LONGPOLLING_PORT="8072"
+
 # Set to "True" to install certbot and have ssl enabled, "False" to use http
 ENABLE_SSL="True"
+
 # Provide Email to register ssl certificate
 ADMIN_EMAIL="odoo@example.com"
+
 ##
 ###  WKHTMLTOPDF download links
 ## === Ubuntu Trusty x64 & x32 === (for other distributions please replace these two links,
@@ -51,17 +64,18 @@ ADMIN_EMAIL="odoo@example.com"
 
 WKHTMLTOX_X64="https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.$(lsb_release -c -s)_amd64.deb"
 WKHTMLTOX_X32="https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.$(lsb_release -c -s)_amd64.deb"
+
 #--------------------------------------------------
 # Update Server
 #--------------------------------------------------
 echo -e "\n---- Update Server ----"
+sudo apt-get update
+sudo apt-get install software-properties-common -y
+sudo apt-get update
 # universe package is for Ubuntu 18.x
 sudo add-apt-repository universe
 # libpng12-0 dependency for wkhtmltopdf
 sudo add-apt-repository "deb http://mirrors.kernel.org/ubuntu/ xenial main"
-sudo apt-get update
-sudo apt-get install software-properties-common -y
-sudo apt-get update
 sudo add-apt-repository ppa:linuxuprising/libpng12 -y
 sudo apt update
 sudo apt-get upgrade -y
@@ -88,6 +102,12 @@ echo -e "\n---- Installing nodeJS NPM and rtlcss for LTR support ----"
 sudo apt-get install nodejs npm -y
 sudo npm install -g rtlcss
 
+sudo pip3 install psycopg2-binary pdfminer.six
+sudo -H pip3 install num2words ofxparse dbfread ebaysdk firebase_admin pyOpenSSL
+sudo npm install -g less
+sudo npm install -g less-plugin-clean-css
+sudo ln -s /usr/bin/nodejs /usr/bin/node
+
 #--------------------------------------------------
 # Install Wkhtmltopdf if needed
 #--------------------------------------------------
@@ -109,6 +129,7 @@ fi
 
 echo -e "\n---- Create ODOO system user ----"
 sudo adduser --system --quiet --shell=/bin/bash --home=$OE_HOME --gecos 'ODOO' --group $OE_USER
+
 #The user should also be added to the sudo'ers group.
 sudo adduser $OE_USER sudo
 
@@ -124,7 +145,6 @@ sudo git clone --depth 1 --branch $OE_VERSION https://www.github.com/odoo/odoo $
 
 if [ $IS_ENTERPRISE = "True" ]; then
     # Odoo Enterprise install!
-    sudo pip3 install psycopg2-binary pdfminer.six
     echo -e "\n--- Create symlink for node"
     sudo ln -s /usr/bin/nodejs /usr/bin/node
     sudo su $OE_USER -c "mkdir $OE_HOME/enterprise"
@@ -143,9 +163,6 @@ if [ $IS_ENTERPRISE = "True" ]; then
 
     echo -e "\n---- Added Enterprise code under $OE_HOME/enterprise/addons ----"
     echo -e "\n---- Installing Enterprise specific libraries ----"
-    sudo -H pip3 install num2words ofxparse dbfread ebaysdk firebase_admin pyOpenSSL
-    sudo npm install -g less
-    sudo npm install -g less-plugin-clean-css
 fi
 
 echo -e "\n---- Create custom module directory ----"
@@ -155,22 +172,27 @@ sudo su $OE_USER -c "mkdir $OE_HOME/custom/addons"
 echo -e "\n---- Setting permissions on home folder ----"
 sudo chown -R $OE_USER:$OE_USER $OE_HOME/*
 
+if [ ! -e "/etc/${OE_CONFIG}.conf" ]; then
+
     echo -e "* Create server config file"
     sudo mkdir /etc/$OE_USER
     sudo chown -R $OE_USER /etc/$OE_USER
     sudo touch /etc/${OE_CONFIG}.conf
+
     echo -e "* Creating server config file"
     sudo su root -c "printf '[options] \n; This is the password that allows database operations:\n' >> /etc/${OE_CONFIG}.conf"
     if [ $GENERATE_RANDOM_PASSWORD = "True" ]; then
         echo -e "* Generating random admin password"
         OE_SUPERADMIN=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)
     fi
+
     sudo su root -c "printf 'admin_passwd = ${OE_SUPERADMIN}\n' >> /etc/${OE_CONFIG}.conf"
     if [ $OE_VERSION > "11.0" ];then
         sudo su root -c "printf 'http_port = ${OE_PORT}\n' >> /etc/${OE_CONFIG}.conf"
     else
         sudo su root -c "printf 'xmlrpc_port = ${OE_PORT}\n' >> /etc/${OE_CONFIG}.conf"
     fi
+
     sudo su root -c "printf 'logfile = /var/log/${OE_USER}/${OE_CONFIG}.log\n' >> /etc/${OE_CONFIG}.conf"
 
     if [ $IS_ENTERPRISE = "True" ]; then
@@ -178,9 +200,12 @@ if [ $IS_ENTERPRISE = "True" ]; then
     else
         sudo su root -c "printf 'addons_path=${OE_HOME_EXT}/addons,${OE_HOME}/custom/addons\n' >> /etc/${OE_CONFIG}.conf"
     fi
+
     sudo chown $OE_USER:$OE_USER /etc/${OE_CONFIG}.conf
     sudo chmod 640 /etc/${OE_CONFIG}.conf
 
+fi
+
 sudo ln -s $OE_HOME_EXT/odoo-bin /usr/bin/odoo
 sudo ln -s $OE_HOME_EXT/debian/odoo.service /etc/systemd/system/
 sudo systemctl daemon-reload