diff --git a/files/requirements.txt b/files/requirements.txt index 37aa8ad8ae3c459e53b113e34eae308e9c01f63b..b38fba63b9dd39629527d6e24fbcb9b727dd4189 100644 --- a/files/requirements.txt +++ b/files/requirements.txt @@ -129,7 +129,7 @@ odoo12-addon-sm-partago-db==12.0.0.0.10 odoo12-addon-sm-partago-invoicing==12.0.0.1.9 odoo12-addon-sm-partago-invoicing-rest-api==12.0.0.0.2 odoo12-addon-sm-partago-tariffs==12.0.0.0.9 -odoo12-addon-sm-partago-usage==12.0.0.1.11 +odoo12-addon-sm-partago-usage==12.0.0.1.12 odoo12-addon-sm-partago-user==12.0.0.1.8 odoo12-addon-sm-partago-user-rest-api==12.0.0.0.7 odoo12-addon-sm-pocketbook==12.0.0.0.9 diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index d61fa113000382be1dd2b6ffefbb1386c4106692..a349ab8a90b307d79d594259bc853cb7c8d2b50f 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -349,7 +349,7 @@ odoo_role_limit_time_real: 12000 postgresql_python_library: python3-psycopg2 # Odoo provisioning -odoo_provisioning_version: "v0.7.15" +odoo_provisioning_version: "v0.7.19" # Production security defaults odoo_role_odoo_http_interface: '127.0.0.1' @@ -358,6 +358,7 @@ odoo_role_odoo_proxy_mode: true # Nginx configuration nginx_configs: upstream: + - upstream uexporter { server 127.0.0.1:9839; } - upstream odoo { server 127.0.0.1:8069; } - upstream nexporter { server 127.0.0.1:9100; } - upstream pexporter { server 127.0.0.1:9187; } @@ -424,5 +425,13 @@ nginx_sites: auth_basic "closed site"; auth_basic_user_file /etc/nginx/.bexporter.htpasswd; } + + location /uexporter/ { + include proxy_params; + proxy_redirect off; + proxy_pass http://uexporter/; + auth_basic "closed site"; + auth_basic_user_file /etc/nginx/.uexporter.htpasswd; + } gzip_types text/css text/less text/plain text/xml application/xml application/json application/javascript; gzip on; diff --git a/inventory/host_vars/carsharing.coop/config.yml b/inventory/host_vars/carsharing.coop/config.yml index 77c58d1f5553453a7b59cb6fb879dfa7700fb520..697e371f9efca51ae8d24f795ee40f8c4c50101d 100644 --- a/inventory/host_vars/carsharing.coop/config.yml +++ b/inventory/host_vars/carsharing.coop/config.yml @@ -78,6 +78,7 @@ firewall_allowed_tcp_ports: - "443" # for HTTPS. basic_auth_users: + - { 'path': '/etc/nginx/.uexporter.htpasswd', 'name': 'uexporter', 'password': '{{ basic_auth_user_uexporter_password }}' } - { 'path': '/etc/nginx/.nexporter.htpasswd', 'name': odoo, 'password': '{{ basic_auth_api_password }}' } - { 'path': '/etc/nginx/.pexporter.htpasswd', 'name': 'pexporter', 'password': '{{ basic_auth_user_pexporter_password }}' } - { 'path': '/etc/nginx/.bexporter.htpasswd', 'name': 'bexporter', 'password': '{{ basic_auth_user_bexporter_password }}' } diff --git a/inventory/host_vars/carsharing.coop/secrets.yml b/inventory/host_vars/carsharing.coop/secrets.yml index c78cbee956e3d2782cfc185ef921cae35d020059..5e98a63d38ce1b05befeff0d6cea2307b7a98409 100644 --- a/inventory/host_vars/carsharing.coop/secrets.yml +++ b/inventory/host_vars/carsharing.coop/secrets.yml @@ -77,3 +77,5 @@ basic_auth_user_bexporter_password: !vault | 63323336313662326433643264363965333534353561376335663464396333383465316630343333 6539306164323334650a313662336432313132636637626162613834333063333166333437656262 38366431343761626165633936313062366231363039616464353063633536663139 + +basic_auth_user_uexporter_password: "{{ basic_auth_api_password }}" \ No newline at end of file diff --git a/inventory/host_vars/test.carsharing.coop/config.yml b/inventory/host_vars/test.carsharing.coop/config.yml index 50887054f752b756f0fb2ce125c6782ca2f1ecd3..977a2a3912dbc3aa88dcdec0e075378c198eb339 100644 --- a/inventory/host_vars/test.carsharing.coop/config.yml +++ b/inventory/host_vars/test.carsharing.coop/config.yml @@ -79,6 +79,7 @@ firewall_allowed_tcp_ports: - "443" # for HTTPS. basic_auth_users: + - { 'path': '/etc/nginx/.uexporter.htpasswd', 'name': 'uexporter', 'password': '{{ basic_auth_user_uexporter_password }}' } - { 'path': '/etc/nginx/.nexporter.htpasswd', 'name': odoo, 'password': '{{ basic_auth_api_password }}' } - { 'path': '/etc/nginx/.pexporter.htpasswd', 'name': 'pexporter', 'password': '{{ basic_auth_user_pexporter_password }}' } - { 'path': '/etc/nginx/.bexporter.htpasswd', 'name': 'bexporter', 'password': '{{ basic_auth_user_bexporter_password }}' } diff --git a/inventory/host_vars/test.carsharing.coop/secrets.yml b/inventory/host_vars/test.carsharing.coop/secrets.yml index c78cbee956e3d2782cfc185ef921cae35d020059..6c4a9175882668a8fb59146ce792867ecb20929f 100644 --- a/inventory/host_vars/test.carsharing.coop/secrets.yml +++ b/inventory/host_vars/test.carsharing.coop/secrets.yml @@ -77,3 +77,5 @@ basic_auth_user_bexporter_password: !vault | 63323336313662326433643264363965333534353561376335663464396333383465316630343333 6539306164323334650a313662336432313132636637626162613834333063333166333437656262 38366431343761626165633936313062366231363039616464353063633536663139 + +basic_auth_user_uexporter_password: "{{ basic_auth_user_nexporter_password }}" \ No newline at end of file