diff --git a/install.sh b/install.sh index 3840ff6..8c045ae 100755 --- a/install.sh +++ b/install.sh @@ -2,10 +2,16 @@ export COMPANY="foss" -function write_data() +export ODOO_REPO="odoo_repo_"$COMPANY"" +export ODOO_LIB="odoo_lib_"$COMPANY"" +export ODOO_ETC="odoo_etc_"$COMPANY"" +export ODOO_BACKUP="odoo_backup_"$COMPANY"" +export POSTGRES_PGDATA="postgres_pgdata_"$COMPANY"" + +function clone_data() { - if [ -f data/"$1".tar.gz ]; then - docker run -it --rm -v "$1":/webportal -v $(pwd)/data:/backup busybox tar zxvf /backup/"$1".tar.gz -C /webportal + if [ "$1" = $ODOO_REPO ]; then + docker run -it --rm -v "$1":/webportal -w /webportal 2bas/repo /bin/bash "-c" "git clone --progress --branch online_service -v --depth 1 git@git.foss.com.ua:fossdoc/webportal.git .; exit;"; fi } @@ -14,16 +20,16 @@ function create_volume() IS_EXIST_VOLUME="$(docker volume ls -q -f name="^${1}$")" if [ -z "${IS_EXIST_VOLUME}" ];then - echo "create volume: ${1}" - docker volume create --name "$1" - write_data "$1" + echo "create volume: ${1}"; + docker volume create --name "$1"; + clone_data "$1"; else while true; do - read -p "Volume ${1} already exist. Overwrite (no\yes)?" ny + read -p "Volume ${1} already exist. Overwrite (no|yes)?" ny case $ny in [Yy]* ) docker volume rm "$1"; docker volume create --name "$1"; - write_data "$1" + clone_data "$1"; break;; [Nn]* ) break;; * ) echo "Please answer yes or no.";; @@ -32,14 +38,7 @@ function create_volume() fi } -export ODOO_REPO="odoo_repo_"$COMPANY"" -export ODOO_LIB="odoo_lib_"$COMPANY"" -export ODOO_ETC="odoo_etc_"$COMPANY"" -export ODOO_BACKUP="odoo_backup_"$COMPANY"" -export POSTGRES_PGDATA="postgres_pgdata_"$COMPANY"" - create_volume $ODOO_REPO - docker run -it --rm -v "$ODOO_REPO":/webportal -w /webportal 2bas/repo /bin/bash "-c" "git pull; exit;" create_volume $ODOO_LIB diff --git a/odoo/openerp-server.conf b/odoo/openerp-server.conf index 6abdb00..fbdac2e 100644 --- a/odoo/openerp-server.conf +++ b/odoo/openerp-server.conf @@ -23,8 +23,8 @@ limit_time_real = 120 list_db = True log_db = False log_db_level = warning -log_handler = :DEBUG -log_level = info +log_handler = :WARNING +log_level = warning logfile = /var/log/odoo/odoo.log logrotate = False longpolling_port = 8072