[UPD] refactoring and db creation update

README.md

@@ -12,13 +12,13 @@ Obsahuje skripty pre vytvorenie a konfiguráciu lokálnej VM prostredníctvom [m
 ## Inicializácia
 Stiahnutie skriptov a konfiguračných súborov do cieľového adresára `<WORKING_DIR>`.
 
-```
+```bash
 git clone https://gitea.egroup.sk/development/zdc-tools --depth 1 --branch master <WORKING_DIR>/zdc-tools
 ```
 
 ### Nastavenie oprávnení
 
-```
+```bash
 cd <WORKING_DIR>/zdc-tools
 chmod +x *.sh
 
@@ -40,7 +40,7 @@ Prostrednícvom skriptu sú príkazmi `multipass exec` konfigurované jednotliv
 
 
 ### Spustenie skriptu
-```
+```bash
 ./vm-create.sh <VM_NAME>
 
 ```
@@ -48,28 +48,47 @@ Prostrednícvom skriptu sú príkazmi `multipass exec` konfigurované jednotliv
 ## Vytvorenie novej databázy
 
 ### Popis skriptu
-Skript `vm-new-db.sh` umožňuje vytvoriť novú databázu zo šablóny.
+Skript `vm-db-create.sh` umožňuje vytvoriť novú databázu zo šablóny.
 
 ### Parametre skriptu
 - `<VM_NAME>` - názov existujúceho virtuálneho servera
 - `<DB_NAME>` - názov novej databázy
 
 ### Spustenie skriptu
-```
-./vm-new-db.sh <VM_NAME> <DB_NAME>
+```bash
+./vm-db-create.sh <VM_NAME> <DB_NAME>
 
 ```
 
-## Aktualizácia kódu z gitea repozitára
+## Aktualizácia kódu platformy z gitea repozitára
 
 ### Popis skriptu
-Skript `vm-update-git.sh` umožňuje vytvoriť aktualizovať inštalácie zdc-odoo a zdc-oca-addons z gitea repositára.  
+Skript `vm-zdc-update.sh` umožňuje aktualizovať existujúce inštalácie **zdc-core-addons** a **zdc-oca-addons** z gitea repozitára.  
 
 ### Parametre skriptu
 - `<VM_NAME>` - názov existujúceho virtuálneho servera
 
 ### Spustenie skriptu
-```
-./vm-update-git.sh <VM_NAME>
+```bash
+./vm-zdc-update.sh <VM_NAME>
+
+```
+
+## Aktualizácia development z gitea repozitára
+
+### Popis skriptu
+Pri novej inštalácii sa vývojový adresár inicializuje z **master** vetvy. Skript `vm-dev-update.sh` umožňuje aktualizovať vývojový adresár z **dev** vetvy gitea repozitára.  Pri vývoji si každý vývojár vytvorí vlastnú vetvu, v ktorej priebežne zapisuje svoje zmeny a následne  ju spojí do **dev** vetvy. Spojenie do **master** vetvy môže potvrdiť len administrátor.
+
+### Parametre skriptu
+- `<VM_NAME>` - názov existujúceho virtuálneho servera
+
+### Interné premenné
+Slúžia na vlastné prispôsobenie skriptu pre nastavenie aktuálne používaného repozitára pre vývoj.
+- `<DEV_REPO>` - názov používaného repozitára pre vývoj
+- `<DEV_BRANCH>` - názov používanej vetvy (branch)
+
+### Spustenie skriptu
+```bash
+./vm-dev-update.sh <VM_NAME>
 
 ```

cloud-init/zdc-odoo-init.yaml

@@ -10,6 +10,7 @@ packages:
 - curl
 - git
 - wget
+- unzip
 - python3-pip
 - build-essential
 - python3-dev
@@ -26,11 +27,12 @@ packages:
 # boot commands
 # These are like 'runcmd', but run very early in the boot process & run on every boot by default.
 bootcmd:
-  - echo $(whoami) > /root/boot.txt
+- echo $(whoami) > /root/boot.txt
 
 runcmd:
 # enable postgres
 - systemctl enable --now postgresql.service
+# create db user
 - su - postgres -c "createuser -s ubuntu"
 # setup directories
 - sudo -u ubuntu mkdir /home/ubuntu/config

config/odoo12.conf

@@ -3,4 +3,4 @@ db_host = False
 db_port = False
 db_user = ubuntu
 db_password = False
-addons_path = /home/ubuntu/odoo12/addons,/home/ubuntu/custom/zdc-oca-addons,/home/ubuntu/custom/dev-addons
+addons_path = /home/ubuntu/custom/zdc-core-addons,/home/ubuntu/custom/zdc-oca-addons,/home/ubuntu/custom/dev-addons

config/venv-install.sh

@@ -76,4 +76,11 @@ if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
 fi
 
 pip3 install wheel
-pip3 install -r /home/ubuntu/odoo12/requirements.txt
+pip3 install -r /home/ubuntu/odoo12/requirements.txt   ## for zdc-odoo
+pip3 install python-ldap ## for ldap addons
+pip3 install cerberus pyquerystring parse-accept-language  ## for rest addons
+pip3 install cachetools  ## for connector addons
+pip3 install altair bokeh  ## for kpi dashboard addons
+pip3 install zxcvbn   ## for password security
+pip3 install xlsxwriter xlrd   ## for xlsx export
+pip3 install sqlalchemy  ## for mysql coonnection

vm-create.sh

@@ -3,6 +3,9 @@
 NAME=$1
 
 PRIVATE_KEY=~/.ssh/id_rsa
+PUBLIC_KEY=~/.ssh/id_rsa.pub
+
+DB_NAME=zdcbasedb10
 
 echo "### Create Ubuntu 18.04 LTS VM"
 multipass launch bionic --name $NAME --cpus 2 --mem 2048M --disk 12G --cloud-init ./cloud-init/zdc-odoo-init.yaml
@@ -11,13 +14,15 @@ echo "### Install wkhtmltopdf"
 multipass exec $NAME -- sudo wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb -O /tmp/wkhtmltox_0.12.6-1.bionic_amd64.deb
 multipass exec $NAME -- sudo apt install /tmp/wkhtmltox_0.12.6-1.bionic_amd64.deb -y
 
-echo "### Add ssh private key"
+echo "### Add ssh private and public key"
 multipass transfer $PRIVATE_KEY $NAME:/home/ubuntu/.ssh/id_rsa
+multipass transfer $PUBLIC_KEY $NAME:/home/ubuntu/.ssh/id_rsa.pub
 multipass transfer config/ssh_known_hosts $NAME:/home/ubuntu/.ssh/known_hosts
 multipass exec $NAME -- chmod 600 /home/ubuntu/.ssh/id_rsa
 
 echo "### Add  OCB Odoo, OCA addons"
 multipass exec $NAME -- /usr/bin/git clone git@gitea.egroup.sk:development/zdc-odoo --depth 1 --branch master /home/ubuntu/odoo12
+multipass exec $NAME -- /usr/bin/git clone git@gitea.egroup.sk:development/zdc-core-addons --depth 1 --branch master /home/ubuntu/custom/zdc-core-addons
 multipass exec $NAME -- /usr/bin/git clone git@gitea.egroup.sk:development/zdc-oca-addons --depth 1 --branch master /home/ubuntu/custom/zdc-oca-addons
 multipass exec $NAME -- /usr/bin/git clone git@gitea.egroup.sk:development/zdc-addons --depth 1 --branch master /home/ubuntu/custom/dev-addons
 
@@ -35,9 +40,13 @@ multipass exec $NAME -- sudo systemctl daemon-reload
 multipass exec $NAME -- sudo systemctl enable --now odoo12.service
 
 echo "### Create ZDC Template DB"
-multipass transfer db/zdc-template-db.sql $NAME:/home/ubuntu/db/zdc-template-db.sql
-multipass exec $NAME -- sudo -u postgres psql -c "CREATE DATABASE zdcbasedb10 WITH OWNER=ubuntu;"
-multipass exec $NAME -- sudo -u postgres psql -d zdcbasedb10 -f /home/ubuntu/db/zdc-template-db.sql
+multipass transfer db/zdc-db-dump-v1.sql.gz $NAME:/home/ubuntu/db/zdc-db-dump.sql.gz
+multipass transfer db/zdc-db-filestore-v1.zip $NAME:/home/ubuntu/db/zdc-db-filestore.zip
+multipass exec $NAME -- gzip -d /home/ubuntu/db/zdc-db-dump.sql.gz
+multipass exec $NAME -- sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER=ubuntu;"
+multipass exec $NAME -- sudo -u postgres psql -d $DB_NAME -f /home/ubuntu/db/zdc-db-dump.sql
+multipass exec $NAME -- mkdir -p /home/ubuntu/.local/share/Odoo/filestore/$DB_NAME
+multipass exec $NAME -- unzip /home/ubuntu/db/zdc-db-filestore.zip -d /home/ubuntu/.local/share/Odoo/filestore/$DB_NAME
 
 echo "### Check VM"
 multipass list  | grep $NAME
@@ -45,3 +54,6 @@ URL_IP=`multipass info $NAME | grep IPv4 | sed -e 's/ //g' -e '/^$/d' | sed -e '
 
 echo "###"
 echo "### Odoo database manager on $NAME server: http://$URL_IP:8069/web/database/selector"
+echo "###"
+
+open http://$URL_IP:8069/web/

vm-db-create.sh

@@ -5,4 +5,6 @@ DB_NAME=$2
 
 echo "### Create Db from Template"
 multipass exec $NAME -- sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER=ubuntu;"
-multipass exec $NAME -- sudo -u postgres psql -d $DB_NAME -f /home/ubuntu/db/zdc-template-db.sql
+multipass exec $NAME -- sudo -u postgres psql -d $DB_NAME -f /home/ubuntu/db/zdc-db-dump.sql
+multipass exec $NAME -- mkdir -p /home/ubuntu/.local/share/Odoo/filestore/$DB_NAME
+multipass exec $NAME -- unzip /home/ubuntu/db/zdc-db-filestore.zip -d /home/ubuntu/.local/share/Odoo/filestore/$DB_NAME

vm-dev-update.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# customise for your development fork
+
+NAME=$1
+DEV_REPO="development/zdc-addons"
+DEV_BRANCH="dev"
+
+echo "### Stop odoo service"
+multipass exec $NAME -- sudo systemctl stop odoo12.service
+
+echo "### Remove old dev repostitory"
+multipass exec $NAME -- sudo rm -r /home/ubuntu/custom/dev-addons
+
+echo "### Clone new dev repository"
+multipass exec $NAME -- /usr/bin/git clone git@gitea.egroup.sk:$DEV_REPO --depth 1 --branch $DEV_BRANCH /home/ubuntu/custom/dev-addons
+
+echo "### Start odoo service"
+multipass exec $NAME -- sudo systemctl start odoo12.service

vm-zdc-update.sh

@@ -7,10 +7,12 @@ multipass exec $NAME -- sudo systemctl stop odoo12
 
 echo "### Remove old repostitories"
 multipass exec $NAME -- sudo rm -r /home/ubuntu/odoo12
+multipass exec $NAME -- sudo rm -r /home/ubuntu/custom/zdc-core-addons
 multipass exec $NAME -- sudo rm -r /home/ubuntu/custom/zdc-oca-addons
 
 echo "### Clone new repositories"
 multipass exec $NAME -- /usr/bin/git clone git@gitea.egroup.sk:development/zdc-odoo --depth 1 --branch master /home/ubuntu/odoo12
+multipass exec $NAME -- /usr/bin/git clone git@gitea.egroup.sk:development/zdc-core-addons --depth 1 --branch master /home/ubuntu/custom/zdc-core-addons
 multipass exec $NAME -- /usr/bin/git clone git@gitea.egroup.sk:development/zdc-oca-addons --depth 1 --branch master /home/ubuntu/custom/zdc-oca-addons
 
 echo "### Start odoo service"