From 809be3dc5bf7f951fc434b698ae2f514a5311254 Mon Sep 17 00:00:00 2001 From: aryge Date: Wed, 16 Nov 2016 13:08:25 +0700 Subject: [PATCH 1/8] Update odoo_install.sh Change openerp-server to odoo-bin --- odoo_install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/odoo_install.sh b/odoo_install.sh index 8be9d4a..2d0d135 100644 --- a/odoo_install.sh +++ b/odoo_install.sh @@ -149,7 +149,10 @@ fi echo -e "* Create startup file" sudo su root -c "echo '#!/bin/sh' >> $OE_HOME_EXT/start.sh" -sudo su root -c "echo 'sudo -u $OE_USER $OE_HOME_EXT/openerp-server --config=/etc/${OE_CONFIG}.conf' >> $OE_HOME_EXT/start.sh" +#-------------------------------------------------- +# openerp-server become odoo-bin +#-------------------------------------------------- +sudo su root -c "echo 'sudo -u $OE_USER $OE_HOME_EXT/odoo-bin --config=/etc/${OE_CONFIG}.conf' >> $OE_HOME_EXT/start.sh" sudo chmod 755 $OE_HOME_EXT/start.sh #-------------------------------------------------- From 3dc278fed7fffd1dda72e4fee0947026046d3fe9 Mon Sep 17 00:00:00 2001 From: aryge Date: Thu, 17 Nov 2016 10:02:21 +0700 Subject: [PATCH 2/8] Update odoo_install.sh add --single-branch paramater --- odoo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo_install.sh b/odoo_install.sh index 2d0d135..78bba5e 100644 --- a/odoo_install.sh +++ b/odoo_install.sh @@ -116,7 +116,7 @@ if [ $IS_ENTERPRISE = "True" ]; then sudo su $OE_USER -c "mkdir $OE_HOME/enterprise/addons" echo -e "\n---- Adding Enterprise code under $OE_HOME/enterprise/addons ----" - sudo git clone --depth 1 --branch 10.0 https://www.github.com/odoo/enterprise "$OE_HOME/enterprise/addons" + sudo git clone --depth 1 --branch 10.0 --single-branch https://www.github.com/odoo/enterprise "$OE_HOME/enterprise/addons" echo -e "\n---- Installing Enterprise specific libraries ----" sudo apt-get install nodejs npm From aea4aeac7df90afd852ebd518fe66e07060958a6 Mon Sep 17 00:00:00 2001 From: aryge Date: Fri, 20 Jan 2017 06:39:35 +0000 Subject: [PATCH 3/8] Update odoo_install.sh --- odoo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo_install.sh b/odoo_install.sh index 78bba5e..690ef23 100644 --- a/odoo_install.sh +++ b/odoo_install.sh @@ -106,7 +106,7 @@ sudo chown $OE_USER:$OE_USER /var/log/$OE_USER # Install ODOO #-------------------------------------------------- echo -e "\n==== Installing ODOO Server ====" -sudo git clone --depth 1 --branch $OE_VERSION https://www.github.com/odoo/odoo $OE_HOME_EXT/ +sudo git clone --depth 1 --branch $OE_VERSION https://www.github.com/odoo/odoo.git $OE_HOME_EXT/ if [ $IS_ENTERPRISE = "True" ]; then # Odoo Enterprise install! From c1f7d46deb5b16d230e0b954a00070e3c6ab1b74 Mon Sep 17 00:00:00 2001 From: aryge Date: Thu, 26 Jan 2017 16:14:08 +0700 Subject: [PATCH 4/8] Update odoo_install.sh Add odoo/addons to the addons path --- odoo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo_install.sh b/odoo_install.sh index 690ef23..1bca695 100644 --- a/odoo_install.sh +++ b/odoo_install.sh @@ -144,7 +144,7 @@ sudo su root -c "echo 'logfile = /var/log/$OE_USER/$OE_CONFIG$1.log' >> /etc/${O if [ $IS_ENTERPRISE = "True" ]; then sudo su root -c "echo 'addons_path=$OE_HOME/enterprise/addons,$OE_HOME_EXT/addons' >> /etc/${OE_CONFIG}.conf" else - sudo su root -c "echo 'addons_path=$OE_HOME_EXT/addons,$OE_HOME/custom/addons' >> /etc/${OE_CONFIG}.conf" + sudo su root -c "echo 'addons_path=$OE_HOME_EXT/odoo/addons,$OE_HOME_EXT/addons,$OE_HOME/custom/addons' >> /etc/${OE_CONFIG}.conf" fi echo -e "* Create startup file" From 740c6c44a07af6be6325203d82fdc046ed28bebc Mon Sep 17 00:00:00 2001 From: aryge Date: Thu, 26 Jan 2017 16:24:26 +0700 Subject: [PATCH 5/8] Update odoo_install.sh --- odoo_install.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/odoo_install.sh b/odoo_install.sh index 1bca695..68c2cb7 100644 --- a/odoo_install.sh +++ b/odoo_install.sh @@ -52,7 +52,7 @@ sudo apt-get upgrade -y # Install PostgreSQL Server #-------------------------------------------------- echo -e "\n---- Install PostgreSQL Server ----" -sudo apt-get install postgresql -y +sudo apt-get install postgresql libxml2-dev postgresql-server-dev-all libxslt-dev libevent-dev libsasl2-dev libldap2-dev -y echo -e "\n---- Creating the ODOO PostgreSQL User ----" sudo su - postgres -c "createuser -s $OE_USER" 2> /dev/null || true @@ -63,16 +63,12 @@ sudo su - postgres -c "createuser -s $OE_USER" 2> /dev/null || true echo -e "\n---- Install tool packages ----" sudo apt-get install wget git python-pip gdebi-core -y -echo -e "\n---- Install python packages ----" -sudo apt-get install python-dateutil python-feedparser python-ldap python-libxslt1 python-lxml python-mako python-openid python-psycopg2 python-pybabel python-pychart python-pydot python-pyparsing python-reportlab python-simplejson python-tz python-vatnumber python-vobject python-webdav python-werkzeug python-xlwt python-yaml python-zsi python-docutils python-psutil python-mock python-unittest2 python-jinja2 python-pypdf python-decorator python-requests python-passlib python-pil -y python-suds - -echo -e "\n---- Install python libraries ----" -sudo pip install gdata psycogreen ofxparse XlsxWriter +echo -e "\n---- Install python packages & libraries ----" +sudo pip install -r https://raw.githubusercontent.com/aryge/odoo/10.0/requirements.txt echo -e "\n--- Install other required packages" sudo apt-get install node-clean-css -y sudo apt-get install node-less -y -sudo apt-get install python-gevent -y #-------------------------------------------------- # Install Wkhtmltopdf if needed From 9561c8185159bd4c009b213f08b7e9cf2251d0b1 Mon Sep 17 00:00:00 2001 From: aryge Date: Fri, 27 Jan 2017 10:07:17 +0700 Subject: [PATCH 6/8] Update odoo_install.sh --- odoo_install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/odoo_install.sh b/odoo_install.sh index 68c2cb7..465b92e 100644 --- a/odoo_install.sh +++ b/odoo_install.sh @@ -52,7 +52,7 @@ sudo apt-get upgrade -y # Install PostgreSQL Server #-------------------------------------------------- echo -e "\n---- Install PostgreSQL Server ----" -sudo apt-get install postgresql libxml2-dev postgresql-server-dev-all libxslt-dev libevent-dev libsasl2-dev libldap2-dev -y +sudo apt-get install postgresql postgresql-server-dev-all -y echo -e "\n---- Creating the ODOO PostgreSQL User ----" sudo su - postgres -c "createuser -s $OE_USER" 2> /dev/null || true @@ -64,7 +64,8 @@ echo -e "\n---- Install tool packages ----" sudo apt-get install wget git python-pip gdebi-core -y echo -e "\n---- Install python packages & libraries ----" -sudo pip install -r https://raw.githubusercontent.com/aryge/odoo/10.0/requirements.txt +sudo apt-get install libxml2-dev libxslt-dev libevent-dev libsasl2-dev libldap2-dev -y +sudo pip install -r https://raw.githubusercontent.com/odoo/odoo/10.0/requirements.txt echo -e "\n--- Install other required packages" sudo apt-get install node-clean-css -y @@ -128,15 +129,14 @@ echo -e "\n---- Setting permissions on home folder ----" sudo chown -R $OE_USER:$OE_USER $OE_HOME/* echo -e "* Create server config file" -sudo cp $OE_HOME_EXT/debian/odoo.conf /etc/${OE_CONFIG}.conf +#sudo cp $OE_HOME_EXT/debian/odoo.conf /etc/${OE_CONFIG}.conf +sudo touch /etc/${OE_CONFIG}.conf sudo chown $OE_USER:$OE_USER /etc/${OE_CONFIG}.conf sudo chmod 640 /etc/${OE_CONFIG}.conf +sudo -u $OE_USER $OE_HOME_EXT/odoo-bin --db_user=$OE_USER --logfile=/var/log/$OE_USER/$OE_CONFIG$1.log --save --config=/etc/${OE_CONFIG}.conf --stop-after-init echo -e "* Change server config file" -sudo sed -i s/"db_user = .*"/"db_user = $OE_USER"/g /etc/${OE_CONFIG}.conf sudo sed -i s/"; admin_passwd.*"/"admin_passwd = $OE_SUPERADMIN"/g /etc/${OE_CONFIG}.conf -sudo su root -c "echo '[options]' >> /etc/${OE_CONFIG}.conf" -sudo su root -c "echo 'logfile = /var/log/$OE_USER/$OE_CONFIG$1.log' >> /etc/${OE_CONFIG}.conf" if [ $IS_ENTERPRISE = "True" ]; then sudo su root -c "echo 'addons_path=$OE_HOME/enterprise/addons,$OE_HOME_EXT/addons' >> /etc/${OE_CONFIG}.conf" else From df21387227c4b9d04160c87f56165acd110dc5a6 Mon Sep 17 00:00:00 2001 From: aryge Date: Fri, 27 Jan 2017 10:21:45 +0700 Subject: [PATCH 7/8] Update odoo_install.sh --- odoo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo_install.sh b/odoo_install.sh index 465b92e..d3be6a0 100644 --- a/odoo_install.sh +++ b/odoo_install.sh @@ -64,7 +64,7 @@ echo -e "\n---- Install tool packages ----" sudo apt-get install wget git python-pip gdebi-core -y echo -e "\n---- Install python packages & libraries ----" -sudo apt-get install libxml2-dev libxslt-dev libevent-dev libsasl2-dev libldap2-dev -y +sudo apt-get install libxml2-dev libxslt1-dev libevent-dev libsasl2-dev libldap2-dev -y sudo pip install -r https://raw.githubusercontent.com/odoo/odoo/10.0/requirements.txt echo -e "\n--- Install other required packages" From e7b4403e56b87dee4ddf2219ff8f0ab4f750d80c Mon Sep 17 00:00:00 2001 From: aryge Date: Fri, 27 Jan 2017 11:30:22 +0700 Subject: [PATCH 8/8] Update odoo_install.sh --- odoo_install.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/odoo_install.sh b/odoo_install.sh index d3be6a0..d3b5bbe 100644 --- a/odoo_install.sh +++ b/odoo_install.sh @@ -129,11 +129,10 @@ echo -e "\n---- Setting permissions on home folder ----" sudo chown -R $OE_USER:$OE_USER $OE_HOME/* echo -e "* Create server config file" -#sudo cp $OE_HOME_EXT/debian/odoo.conf /etc/${OE_CONFIG}.conf sudo touch /etc/${OE_CONFIG}.conf sudo chown $OE_USER:$OE_USER /etc/${OE_CONFIG}.conf sudo chmod 640 /etc/${OE_CONFIG}.conf -sudo -u $OE_USER $OE_HOME_EXT/odoo-bin --db_user=$OE_USER --logfile=/var/log/$OE_USER/$OE_CONFIG$1.log --save --config=/etc/${OE_CONFIG}.conf --stop-after-init +sudo -u $OE_USER $OE_HOME_EXT/odoo-bin --db_user=$OE_USER --logfile=/var/log/$OE_USER/$OE_CONFIG$1.log xmlrpc_port=$OE_PORT --save --config=/etc/${OE_CONFIG}.conf --stop-after-init echo -e "* Change server config file" sudo sed -i s/"; admin_passwd.*"/"admin_passwd = $OE_SUPERADMIN"/g /etc/${OE_CONFIG}.conf @@ -234,9 +233,6 @@ sudo mv ~/$OE_CONFIG /etc/init.d/$OE_CONFIG sudo chmod 755 /etc/init.d/$OE_CONFIG sudo chown root: /etc/init.d/$OE_CONFIG -echo -e "* Change default xmlrpc port" -sudo su root -c "echo 'xmlrpc_port = $OE_PORT' >> /etc/${OE_CONFIG}.conf" - echo -e "* Start ODOO on Startup" sudo update-rc.d $OE_CONFIG defaults