Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • coopdevs/odoo/inventories/odoo-vertical-carsharing-inventory
1 result
Show changes
Commits on Source (5)
...@@ -128,7 +128,7 @@ odoo12-addon-sm-partago-accounting==12.0.0.0.4 ...@@ -128,7 +128,7 @@ odoo12-addon-sm-partago-accounting==12.0.0.0.4
odoo12-addon-sm-partago-db==12.0.0.0.10 odoo12-addon-sm-partago-db==12.0.0.0.10
odoo12-addon-sm-partago-invoicing==12.0.0.1.8 odoo12-addon-sm-partago-invoicing==12.0.0.1.8
odoo12-addon-sm-partago-tariffs==12.0.0.0.9 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==12.0.0.1.8
odoo12-addon-sm-partago-user-rest-api==12.0.0.0.7 odoo12-addon-sm-partago-user-rest-api==12.0.0.0.7
odoo12-addon-sm-pocketbook==12.0.0.0.9 odoo12-addon-sm-pocketbook==12.0.0.0.9
......
...@@ -346,7 +346,7 @@ odoo_role_limit_time_real: 12000 ...@@ -346,7 +346,7 @@ odoo_role_limit_time_real: 12000
postgresql_python_library: python3-psycopg2 postgresql_python_library: python3-psycopg2
# Odoo provisioning # Odoo provisioning
odoo_provisioning_version: "v0.7.15" odoo_provisioning_version: "v0.7.19"
# Production security defaults # Production security defaults
odoo_role_odoo_http_interface: '127.0.0.1' odoo_role_odoo_http_interface: '127.0.0.1'
...@@ -355,6 +355,7 @@ odoo_role_odoo_proxy_mode: true ...@@ -355,6 +355,7 @@ odoo_role_odoo_proxy_mode: true
# Nginx configuration # Nginx configuration
nginx_configs: nginx_configs:
upstream: upstream:
- upstream uexporter { server 127.0.0.1:9839; }
- upstream odoo { server 127.0.0.1:8069; } - upstream odoo { server 127.0.0.1:8069; }
- upstream nexporter { server 127.0.0.1:9100; } - upstream nexporter { server 127.0.0.1:9100; }
- upstream pexporter { server 127.0.0.1:9187; } - upstream pexporter { server 127.0.0.1:9187; }
...@@ -421,5 +422,13 @@ nginx_sites: ...@@ -421,5 +422,13 @@ nginx_sites:
auth_basic "closed site"; auth_basic "closed site";
auth_basic_user_file /etc/nginx/.bexporter.htpasswd; 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_types text/css text/less text/plain text/xml application/xml application/json application/javascript;
gzip on; gzip on;
...@@ -78,6 +78,7 @@ firewall_allowed_tcp_ports: ...@@ -78,6 +78,7 @@ firewall_allowed_tcp_ports:
- "443" # for HTTPS. - "443" # for HTTPS.
basic_auth_users: 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/.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/.pexporter.htpasswd', 'name': 'pexporter', 'password': '{{ basic_auth_user_pexporter_password }}' }
- { 'path': '/etc/nginx/.bexporter.htpasswd', 'name': 'bexporter', 'password': '{{ basic_auth_user_bexporter_password }}' } - { 'path': '/etc/nginx/.bexporter.htpasswd', 'name': 'bexporter', 'password': '{{ basic_auth_user_bexporter_password }}' }
...@@ -77,3 +77,5 @@ basic_auth_user_bexporter_password: !vault | ...@@ -77,3 +77,5 @@ basic_auth_user_bexporter_password: !vault |
63323336313662326433643264363965333534353561376335663464396333383465316630343333 63323336313662326433643264363965333534353561376335663464396333383465316630343333
6539306164323334650a313662336432313132636637626162613834333063333166333437656262 6539306164323334650a313662336432313132636637626162613834333063333166333437656262
38366431343761626165633936313062366231363039616464353063633536663139 38366431343761626165633936313062366231363039616464353063633536663139
basic_auth_user_uexporter_password: "{{ basic_auth_api_password }}"
\ No newline at end of file
...@@ -79,6 +79,7 @@ firewall_allowed_tcp_ports: ...@@ -79,6 +79,7 @@ firewall_allowed_tcp_ports:
- "443" # for HTTPS. - "443" # for HTTPS.
basic_auth_users: 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/.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/.pexporter.htpasswd', 'name': 'pexporter', 'password': '{{ basic_auth_user_pexporter_password }}' }
- { 'path': '/etc/nginx/.bexporter.htpasswd', 'name': 'bexporter', 'password': '{{ basic_auth_user_bexporter_password }}' } - { 'path': '/etc/nginx/.bexporter.htpasswd', 'name': 'bexporter', 'password': '{{ basic_auth_user_bexporter_password }}' }
...@@ -77,3 +77,5 @@ basic_auth_user_bexporter_password: !vault | ...@@ -77,3 +77,5 @@ basic_auth_user_bexporter_password: !vault |
63323336313662326433643264363965333534353561376335663464396333383465316630343333 63323336313662326433643264363965333534353561376335663464396333383465316630343333
6539306164323334650a313662336432313132636637626162613834333063333166333437656262 6539306164323334650a313662336432313132636637626162613834333063333166333437656262
38366431343761626165633936313062366231363039616464353063633536663139 38366431343761626165633936313062366231363039616464353063633536663139
basic_auth_user_uexporter_password: "{{ basic_auth_user_nexporter_password }}"
\ No newline at end of file