From 7b0e135f9afdce175bdb502991822aff5040606a Mon Sep 17 00:00:00 2001 From: Andreas Wabro Date: Tue, 11 Sep 2018 16:17:34 +0200 Subject: [PATCH] =?UTF-8?q?F=C3=BCgt=20neues=20Environment=20f=C3=BCr=20In?= =?UTF-8?q?stanz=20allinonept=20hinzu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup/connect-allinonept.sh | 5 ++ setup/lib/config_allinonept.py | 88 +++++++++++++++++++ setup/lib/environments.py | 3 + setup/odoo-playboook/hosts | 4 +- setup/odoo-playboook/playbook-allinonept.yml | 36 ++++++++ .../roles/odoo/tasks/install.yml | 15 +--- 6 files changed, 136 insertions(+), 15 deletions(-) create mode 100755 setup/connect-allinonept.sh create mode 100644 setup/lib/config_allinonept.py create mode 100644 setup/odoo-playboook/playbook-allinonept.yml diff --git a/setup/connect-allinonept.sh b/setup/connect-allinonept.sh new file mode 100755 index 00000000..01fa5837 --- /dev/null +++ b/setup/connect-allinonept.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +PORT=9002 +echo "Zugriff: http://localhost:$PORT" +ssh -p 3336 odoo-prod@5.9.67.35 -L $PORT:localhost:8069 diff --git a/setup/lib/config_allinonept.py b/setup/lib/config_allinonept.py new file mode 100644 index 00000000..27902e31 --- /dev/null +++ b/setup/lib/config_allinonept.py @@ -0,0 +1,88 @@ +# -*- coding: utf-8 -*- + +from .config import Config + + +class ConfigAllInOnePT(Config): + def __init__(self): + super(ConfigAllInOnePT, self).__init__() + + self.company_xmlid = 'dp_custom.glaser_and_co_company' + + self.company_data = { + 'name': 'TZ Technik Solution GesmbH', + 'street': 'Althöflein 9/2', + 'street2': False, + 'city': 'Großkrut', + 'zip': '2143', + 'phone': False, + 'email': False, + 'website': False, + 'company_registry': False, + 'country_id': 'at', # 'de' für Deutschland + 'vat': False, + 'vat_check_vies': True, + 'logo': '../ext/custom-addons/dp_custom/static/src/img/logo.png', + #'favicon_backend': '../ext/custom-addons/dp_custom/static/src/img/favicon.ico', + #'favicon_backend_mimetype': 'image/x-icon' + } + + # Nur für Lager + # Wenn nicht gesetzt, dann wird der Firmenname genommen + self.warehouse_name = 'TZ Technik' + self.warehouse_code = 'TZ Technik' + + self.tax_settings = { + 'default_sale_tax_id': self.default_sales_tax + } + + self.sequences = { + 'sale.order': { + # 'number_next_actual': 1, + 'prefix': 'ATOF%(range_y)s-', + 'padding': 6, + 'use_date_range': True, + 'monthly_date_range': False + }, + 'account.invoice': { + # 'number_next_actual': 0001, + 'prefix': '%(range_year)s-', + 'padding': 6, + 'use_date_range': True, + }, + # Wenn 'account.invoice_refund' auskommentiert ist, dann wird + # für die Gutschrift der selbe Nummernkreis verwendet + # 'account.invoice_refund': { + # # 'number_next_actual': 0001, + # 'name': 'Gutschriften', + # 'implementation': 'no_gap', + # 'prefix': 'GL%(y)s', + # 'padding': 4, + # 'use_date_range': True, + # 'monthly_date_range': False + # }, + # 'picking.out': { + # # 'number_next_actual': 1, + # 'prefix': 'LS-', + # 'padding': 5, + # }, + # 'picking.in': { + # #'number_next_actual': 1, + # 'prefix': 'LS/IN/', + # 'padding': 4, + # }, + # 'picking.int': { + # #'number_next_actual': 1, + # 'prefix': 'LS/INT/', + # 'padding': 4, + # }, + # 'purchase.order': { + # 'number_next_actual': 1, + # 'prefix': 'B-', + # 'padding': 5, + # }, + } + + self.multi_company_settings = { + 'chart_template_id': ('xmlid', 'l10n_at.austria_chart_template') + } diff --git a/setup/lib/environments.py b/setup/lib/environments.py index 177f0f3f..86f641a0 100644 --- a/setup/lib/environments.py +++ b/setup/lib/environments.py @@ -2,6 +2,7 @@ from .config_tza import ConfigTZA from .config_glaser import ConfigGlaser +from .config_allinonept import ConfigAllInOnePT class Environment(): def __init__(self, host, port, dbname, username, pwd=None, super_admin_pw=None, demo=False, config=False): @@ -66,4 +67,6 @@ ENVIRONMENTS = { 'prod': Environment('http://localhost', '9002', 'odoo-prod', 'admin', config = ConfigTZA()), 'prod-glaser': Environment('http://localhost', '9002', 'odoo-prod', 'glaser-admin', config = ConfigGlaser()), + + 'allinonept': Environment('http://localhost', '9002', 'allinonept', 'admin', config=ConfigAllInOnePT()), } diff --git a/setup/odoo-playboook/hosts b/setup/odoo-playboook/hosts index a8b00ee4..e7c1e755 100644 --- a/setup/odoo-playboook/hosts +++ b/setup/odoo-playboook/hosts @@ -1,5 +1,5 @@ [local] localhost ansible_connection=local -[tzaustria] -5.9.67.35:3333 ansible_connection=ssh ansible_user=datenpol \ No newline at end of file +[tzaustria_allinonept] +5.9.67.35:3336 ansible_connection=ssh ansible_user=datenpol diff --git a/setup/odoo-playboook/playbook-allinonept.yml b/setup/odoo-playboook/playbook-allinonept.yml new file mode 100644 index 00000000..734f5142 --- /dev/null +++ b/setup/odoo-playboook/playbook-allinonept.yml @@ -0,0 +1,36 @@ +--- +# This playbook deploys the whole application stack in this site. + +- name: Odoo Prod + hosts: tzaustria_allinonept + become: yes + # deactivate gather_facts when python is not installed on server + # gather_facts: false + # pre_tasks: + # - raw: which python || apt-get update + # - raw: (which python && which aptitude) || apt-get install -y python python-apt aptitude + # - setup: # aka gather_facts + roles: + - role: odoo + odoo_repo_rev: master + odoo_user: odoo-prod + odoo_service: odoo-prod + odoo_version: 11.0 + odoo_config_http_port: 8069 + odoo_config_admin_passwd: ainbeyos + odoo_config_db_passwd: aroneyna + odoo_general_user_passwd: elewcaph + odoo_instance: "prod" + odoo_config_dbfilter: "^{{ odoo_instance }}_.*" + # remove the following paramters to install odoo from github + odoo_repo_url: "ssh://git@gitlab.datenpol.at:122/odoo/tz-austria.git" + odoo_config_addons_path: + - "/data/{{ odoo_user }}/odoo/ext/odoo/odoo/addons" + - "/data/{{ odoo_user }}/odoo/ext/odoo/addons" + - "/data/{{ odoo_user }}/odoo/ext/custom-addons" + - "/data/{{ odoo_user }}/odoo/ext/3rd-party-addons" + odoo_workdir: "/data/{{ odoo_user }}/odoo" + odoo_rootdir: "/data/{{ odoo_user }}/odoo" + odoo_coredir: "/data/{{ odoo_user }}/odoo/ext/odoo" + odoo_config_file: "/data/{{ odoo_user }}/{{ odoo_service }}.conf" + odoo_config_data_dir: "/data/{{ odoo_user }}/.local/share/Odoo" diff --git a/setup/odoo-playboook/roles/odoo/tasks/install.yml b/setup/odoo-playboook/roles/odoo/tasks/install.yml index 1e0c4f19..c7dc994e 100644 --- a/setup/odoo-playboook/roles/odoo/tasks/install.yml +++ b/setup/odoo-playboook/roles/odoo/tasks/install.yml @@ -19,23 +19,12 @@ tags: - odoo_user -- name: Add general odoo user - user: name=odoo shell=/bin/bash - password={{ odoo_general_user_passwd }} update_password=on_create - move_home=yes - home=/data/odoo - - become: yes - become_method: "sudo" - tags: - - odoo_user - -- name: Allow general odoo user to have passwordless sudo +- name: Allow odoo user to have passwordless sudo for restart lineinfile: dest: /etc/sudoers state: present regexp: '^odoo$' - line: 'odoo ALL=(ALL:ALL) NOPASSWD: ALL' + line: '{{ odoo_instance }} ALL=(root) NOPASSWD: /etc/init.d/{{ odoo_instance }}' validate: visudo -cf %s - name: Create log directory