Merge pull request #1 from zamentur/24compat

[enh] Adapt for yunohost 2.4

conf/openerp-server.conf

@@ -1,10 +1,11 @@
 [options]
 ; This is the password that allows database operations:
+without_demo = all
 admin_passwd = ADMIN_PASSWORD
-db_host = False
+db_host = false
-db_port = False
+db_port = false
 db_user = odoo
-db_password = False
+db_password = DATABASE_PASSWORD
 addons_path = /usr/lib/python2.7/dist-packages/openerp/addons
 proxy_mode = true
 dbfilter = %h

manifest.json

@@ -1,6 +1,7 @@
 {
     "name": "Odoo",
     "id": "odoo",
+    "packaging_format": 1,
     "description": {
         "en": "Odoo is a suite of business apps (ERP: CRM, Accounting, Point of Sale, HR, Purchases...).",
         "fr": "Odoo est une collection d'apps de gestion d'entreprise (ERP : CRM, Comptabilité, Point de Vente, RH, Achats, ...)."
@@ -8,7 +9,13 @@
     "developer": {
         "name": "scith"
     },
+    "requirements": {
+        "yunohost": ">> 2.4.0"
+    },
     "multi_instance": "true",
+    "services": [
+        "nginx"
+    ],
     "arguments": {
         "install" : [
             {
@@ -44,7 +51,7 @@
                 }
             },
 			{
-                "name": "database_lang",
+                "name": "lang",
                 "ask": {
                     "en": "Choose a language for Odoo",
 					"fr": "Choisissez une langue pour Odoo"

scripts/backup

@@ -1,3 +1,24 @@
 #! /bin/bash
-app=odoo
+
-# TO BE DONE
+# Exit on command errors and treat unset variables as an error
+set -eu
+
+# See comments in install script
+app=$YNH_APP_INSTANCE_NAME
+
+# Source YunoHost helpers
+. /usr/share/yunohost/helpers
+
+# Backup sources & data
+ynh_backup "/usr/lib/python2.7/dist-packages/openerp/" "sources"
+
+# Copy NGINX configuration
+domain=$(ynh_app_setting_get "$app" domain)
+ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf"
+ynh_backup "/etc/odoo/openerp-server.conf" "openerp-server.conf"
+
+# Copy database
+database=${domain//./-}
+sudo su -c "pg_dump $database" postgres > ./dump.sql
+pwd=`pwd`
+ynh_backup "$pwd/dump.sql" "dump.sql"

scripts/install

@@ -1,15 +1,18 @@
 #!/bin/bash
-app=odoo
+
-set -e
+set -eu
+
+app=$YNH_APP_INSTANCE_NAME
 
 # Retrieve arguments
-domain=$1
+domain=$YNH_APP_ARG_DOMAIN
-odoo_version=$2
+odoo_version=$YNH_APP_ARG_ODOO_VERSION
-admin_password=$3
+admin_password=$YNH_APP_ARG_ADMIN_PASSWORD
-database_password=$4
+database_password=$YNH_APP_ARG_DATABASE_PASSWORD
-database_lang=$5
+lang=$YNH_APP_ARG_LANG
-
 
+# Source YunoHost helpers
+. /usr/share/yunohost/helpers
 
 # Check domain/path availability
 domain=${domain}"/"
@@ -18,11 +21,12 @@ sudo yunohost app checkurl $domain -a $app \
 
 # Remove trailing "/" for next commands
 domain=${domain%/}
-sudo yunohost app setting $app domain -v $domain
+ynh_app_setting_set "$app" domain "$domain"
+ynh_app_setting_set "$app" domain "$domain"
 
 if [ -f /usr/bin/openerp-server ]; then
 	echo "Odoo is already installed, switching to multi-instances"
-	sudo yunohost app setting $app instance -v "slave"
+  ynh_app_setting_set "$app" instance "slave"
 
 else
 	sudo yunohost app checkport 8069
@@ -31,11 +35,11 @@ else
 	fi
 
 	echo "Installing odoo"
-	sudo yunohost app setting $app version -v $odoo_version
+  ynh_app_setting_set "$app" version "$odoo_version"
-	sudo yunohost app setting $app instance -v "master"
+  ynh_app_setting_set "$app" instance "master"
 	# Install Odoo
 	# Prepare installation
-		sudo apt-get -y -qq install curl
+  ynh_package_install curl
 
 	# Install Odoo
 		sudo curl -sS https://nightly.odoo.com/odoo.key | sudo apt-key add -
@@ -47,16 +51,17 @@ else
 		sudo apt-get update
 
 		# Initialize installation
-		sudo apt-get -y -qq install postgresql
+    ynh_package_install postgresql
-		sudo su - postgres -c "echo \"CREATE USER odoo WITH PASSWORD '$admin_password' CREATEDB;\" | psql" 2> /dev/null || true 
+    sudo su -c "psql" postgres <<< \
-		
+    "CREATE USER $app WITH PASSWORD '$database_password' CREATEDB;"
-		sudo apt-get -y -qq install odoo
+    ynh_package_install odoo
 
 	# Install wkhtmltopdf to print PDF reports
-		sudo apt-get -yf -qq install wkhtmltopdf
+		ynh_package_install wkhtmltopdf
 
 	# Set admin password
 		sudo sed -i "s@ADMIN_PASSWORD@$admin_password@g" ../conf/openerp-server.conf
+    sudo sed -i "s@DATABASE_PASSWORD@$database_password@g" ../conf/openerp-server.conf
 		sudo cp ../conf/openerp-server.conf /etc/odoo/openerp-server.conf
 		sudo chown odoo:odoo /etc/odoo/openerp-server.conf
 
@@ -82,14 +87,22 @@ function exit_properly
     exit 1
 }
 trap exit_properly ERR
-# Setup database: not working
-#sudo sed -i "s@ADMIN_PASSWORD@$admin_password@g" ../conf/install_database.py
-#sudo sed -i "s@DOMAIN_DATABASE@${domain//./-}@g" ../conf/install_database.py
-#sudo sed -i "s@DATABASE_LANG@$database_lang@g" ../conf/install_database.py
-#sudo sed -i "s@DATABASE_PASSWORD@$database_password@g" ../conf/install_database.py
-#sudo python ../conf/install_database.py
 
-# Setup LDAP: TO BE DONE
+ynh_psql_create_user() {
+        sudo su -c "psql" postgres <<< \
+        "CREATE USER ${1} WITH PASSWORD '${2}';"
+}
+ynh_psql_create_db() {
+    db=$1
+    # grant all privilegies to user
+    if [[ $# -gt 1 ]]; then
+        ynh_psql_create_user ${2} '${3}'
+        sudo su -c "createdb -O ${2} $db" postgres
+    else
+        sudo su -c "createdb $db" postgres
+    fi
+
+}
 
 # Configure Nginx and reload
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
@@ -98,4 +111,21 @@ trap exit_properly ERR
 sudo yunohost app setting $app skipped_uris -v "/"
 
 sudo service nginx reload
+
+# Fix peer authentification issue
+sudo sed -i '/local\s*all\s*all\s*peer/i \
+local all odoo password' /etc/postgresql/9.4/main/pg_hba.conf
+sudo service postgresql reload
+
+# Setup database: not working
+database=${domain//./-}
+sudo /usr/bin/openerp-server -c /etc/odoo/openerp-server.conf --stop-after-init -d $database
+#ynh_psql_create_db $database
+#sudo sed -i "s@ADMIN_PASSWORD@$admin_password@g" ../conf/install_database.py
+#sudo sed -i "s@DOMAIN_DATABASE@${domain//./-}@g" ../conf/install_database.py
+#sudo sed -i "s@DATABASE_LANG@$lang@g" ../conf/install_database.py
+#sudo sed -i "s@DATABASE_PASSWORD@$database_password@g" ../conf/install_database.py
+#sudo python ../conf/install_database.py
+
+# Setup LDAP: TO BE DONE
 echo $?

scripts/remove

@@ -1,11 +1,18 @@
 #!/bin/bash
-app=odoo
+set -eu
-domain=$(sudo yunohost app setting $app domain)
+
+app=$YNH_APP_INSTANCE_NAME
+# Source YunoHost helpers
+. /usr/share/yunohost/helpers
+
+# Retrieve app settings
+domain=$(ynh_app_setting_get "$app" domain)
+
 database=${domain//./-}
-instance=$(sudo yunohost app setting $app instance)
+instance=$(ynh_app_setting_get "$app" instance)
 
 # Remove database
-	sudo -u postgres dropdb $database
+sudo su -c "dropdb $database" postgres 
 
 # If removing master instance, remove Odoo.
 if [ "$instance" = "master" ]; then

scripts/upgrade

@@ -1,5 +1,12 @@
 #!/bin/bash
-app=odoo
+set -eu
+app=$YNH_APP_INSTANCE_NAME
+
+# Source YunoHost helpers
+. /usr/share/yunohost/helpers
+
+# Retrieve arguments
+domain=$(ynh_app_setting_get "$app" domain)
 
 # Upgrade official package
 	sudo apt-get install odoo -y -qq