diff --git a/dev/odoo-server-dev-br.conf b/dev/odoo-server-dev-br.conf index eb27d1a2..34cad32d 100644 --- a/dev/odoo-server-dev-br.conf +++ b/dev/odoo-server-dev-br.conf @@ -8,7 +8,7 @@ db_port = 5436 db_user = False db_password = False -addons_path = ext/odoo/addons,ext/custom-addons,dev/dmi/run1 +addons_path = ext/odoo/addons,ext/custom-addons,dmi/run1 timezone = Europe/Brussels #dbfilter_test = ['.*',] \ No newline at end of file diff --git a/dev/odoo-server-dev-sk.conf b/dev/odoo-server-dev-sk.conf index 4298cca5..92fedff4 100644 --- a/dev/odoo-server-dev-sk.conf +++ b/dev/odoo-server-dev-sk.conf @@ -8,7 +8,7 @@ db_port = 5433 db_user = False db_password = False -addons_path = ext/odoo/addons,ext/custom-addons,dev/dmi/run1 +addons_path = ext/odoo/addons,ext/custom-addons,dmi/run1 timezone = Europe/Brussels #dbfilter_test = ['.*',] \ No newline at end of file diff --git a/ext/config/logrotate b/ext/config/logrotate deleted file mode 100644 index 060ec54d..00000000 --- a/ext/config/logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/odoo/*.log { - copytruncate - missingok - notifempty -} diff --git a/ext/config/odoo-server.conf b/ext/config/odoo-server.conf index f0b68fe6..4cd6e45d 100644 --- a/ext/config/odoo-server.conf +++ b/ext/config/odoo-server.conf @@ -11,14 +11,15 @@ db_user = False debug_mode = False list_db = True log_level = error -logfile = /var/log/odoo/odoo-server.log #max_cron_threads = 1 #workers = 1 xmlrpc_interface = 127.0.0.1 +# WILL BE OVERWRITTEN BY COMMAND LINE ARGS xmlrpc_port = 8069 longpolling_port = 8072 +logfile = /var/log/odoo/odoo-server.log timezone = Europe/Brussels diff --git a/ext/config/odoo-server.init b/ext/config/odoo-server.init deleted file mode 100755 index 2f0aac66..00000000 --- a/ext/config/odoo-server.init +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: odoo-server -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network -# Should-Stop: $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Enterprise Resource Management software -# Description: Open ERP is a complete ERP and CRM software. -### END INIT INFO - -PATH=/bin:/sbin:/usr/bin:/usr/local/bin -DAEMON=/opt/odoo/odoo/openerp-server -NAME=odoo-server -DESC=odoo-server - -#FILTER="^%d$" -# Specify the user name (Default: openerp). -USER=odoo - -# Specify an alternate config file (Default: /etc/openerp-server.conf). -CONFIGFILE="/opt/odoo/ext/config/odoo-server.conf" - -# pidfile -PIDFILE=/var/run/$NAME.pid - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="-c $CONFIGFILE" - -[ -x $DAEMON ] || exit 0 -[ -f $CONFIGFILE ] || exit 0 - -checkpid() { - [ -f $PIDFILE ] || return 1 - pid=`cat $PIDFILE` - [ -d /proc/$pid ] && return 0 - return 1 -} - -case "${1}" in - start) - echo -n "Starting ${DESC}: " - - start-stop-daemon --start --quiet --pidfile ${PIDFILE} \ - --chuid ${USER} --background --make-pidfile \ - --exec ${DAEMON} -- ${DAEMON_OPTS} - - echo "${NAME}." - ;; - - stop) - echo -n "Stopping ${DESC}: " - - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \ - --oknodo - - echo "${NAME}." - ;; - - restart|force-reload) - echo -n "Restarting ${DESC}: " - - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \ - --oknodo - - sleep 1 - - start-stop-daemon --start --quiet --pidfile ${PIDFILE} \ - --chuid ${USER} --background --make-pidfile \ - --exec ${DAEMON} -- ${DAEMON_OPTS} - - echo "${NAME}." - ;; - - *) - N=/etc/init.d/${NAME} - echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/ext/scripts/odoo-backup.sh b/ext/scripts/odoo-backup.sh deleted file mode 100755 index 67c3efc6..00000000 --- a/ext/scripts/odoo-backup.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -#dump the OpenERP DB (postgreSQL) -#author: Camadeus GmbH - -hostname=`/bin/hostname` - - -dbnames=`psql -d postgres -c "SELECT datname FROM pg_database WHERE NOT datistemplate AND datname <> 'postgres'" --tuples-only` - -# Dump DBs -for db in $dbnames -do - echo "creating backup for db: " $db - date=`date +"%Y%m%d_%H%M%N"` - filename="/var/pgdump/${hostname}_${db}_${date}.sql" - pg_dump -E UTF-8 -F p -b -f $filename $db - chmod 600 $filename - gzip $filename -done - - -########################################## -## Housekeeping -########################################## -for file in `find /var/pgdump/ -mtime +30 -type f -name '*.sql.gz'` -do - echo "deleting: " $file - rm $file -done - - -exit 0 -