aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2019-08-02 09:23:42 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2019-08-08 09:03:13 +0200
commit48ec7b841f853e4ffd8a82e61ed063fd8c5b2e87 (patch)
tree6421fca489a9feb876507561f61ba14d9867ee10 /ansible
parentf2c544a9240817bf7af4169ec19c3bd56f879809 (diff)
downloadinfra-48ec7b841f853e4ffd8a82e61ed063fd8c5b2e87.tar.gz
infra-48ec7b841f853e4ffd8a82e61ed063fd8c5b2e87.tar.bz2
infra-48ec7b841f853e4ffd8a82e61ed063fd8c5b2e87.tar.xz
infra-48ec7b841f853e4ffd8a82e61ed063fd8c5b2e87.zip
o Fixing longpolling.
o Fixing systemd unit file.
Diffstat (limited to 'ansible')
-rw-r--r--ansible/numquam.yml9
-rw-r--r--ansible/odoo/odoo.yml3
2 files changed, 5 insertions, 7 deletions
diff --git a/ansible/numquam.yml b/ansible/numquam.yml
index e423886..d98ef11 100644
--- a/ansible/numquam.yml
+++ b/ansible/numquam.yml
@@ -42,6 +42,7 @@
state: started
- become: yes
+ tags: nginx
copy:
dest: /etc/nginx/sites-enabled/odoo.trygvis.io
content: |
@@ -49,6 +50,8 @@
server {
server_name odoo.trygvis.io;
+ access_log /var/log/nginx/odoo.trygvis.io-access;
+ error_log /var/log/nginx/odoo.trygvis.io-error error;
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/odoo.trygvis.io/fullchain.pem; # managed by Certbot
@@ -57,11 +60,6 @@
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
location / {
- # try_files $uri @proxy;
- # }
- #
-
- # location @proxy {
proxy_set_header Host $host;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header X-Forwarded-Proto $scheme;
@@ -93,5 +91,4 @@
listen 80;
return 404;
}
- tags: x
notify: reload nginx
diff --git a/ansible/odoo/odoo.yml b/ansible/odoo/odoo.yml
index d018bf8..8517c81 100644
--- a/ansible/odoo/odoo.yml
+++ b/ansible/odoo/odoo.yml
@@ -34,6 +34,7 @@
-e PASSWORD=odoo \
-e ADMIN_PASSWD={{ admin_passwd }} \
-p 8069:8069 \
+ -p 8070:8070 \
--mount source=odoo-data,target=/var/lib/odoo \
--mount source=odoo-extra-addons,target=/mnt/extra-addons \
-t \
@@ -46,7 +47,7 @@
--smtp=172.17.0.1 \
--proxy-mode \
--limit-time-cpu={{ limit_time_cpu }} \
- --limit-time-real={{ limit_time_real }} \
+ --limit-time-real={{ limit_time_real }}
[Install]
WantedBy=multi-user.target