summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2020-06-09 17:17:24 -0400
committerDessalines <tyhou13@gmx.com>2020-06-09 17:17:24 -0400
commitbd26e4e9c1b146163ee839de0a45bb9354efd1f2 (patch)
tree0c30425a32666f7597fb1d9362edcf199dc75a7d /ansible
parente583e45d9a2221b3ed2a743cfa172abcd2a1d6a0 (diff)
Fixing some front end pictshare to pictrs conversions.
Diffstat (limited to 'ansible')
-rw-r--r--ansible/lemmy.yml3
-rw-r--r--ansible/templates/docker-compose.yml2
-rw-r--r--ansible/templates/nginx.conf6
3 files changed, 9 insertions, 2 deletions
diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml
index dcafc5ea..0b49856a 100644
--- a/ansible/lemmy.yml
+++ b/ansible/lemmy.yml
@@ -39,6 +39,9 @@
- { src: '../docker/iframely.config.local.js', dest: '/lemmy/iframely.config.local.js', mode: '0600' }
vars:
lemmy_docker_image: "dessalines/lemmy:{{ lookup('file', 'VERSION') }}"
+ lemmy_port: "8536"
+ pictshare_port: "8537"
+ iframely_port: "8538"
- name: add config file (only during initial setup)
template: src='templates/config.hjson' dest='/lemmy/lemmy.hjson' mode='0600' force='no' owner='1000' group='1000'
diff --git a/ansible/templates/docker-compose.yml b/ansible/templates/docker-compose.yml
index 0b33399b..f4c94fd7 100644
--- a/ansible/templates/docker-compose.yml
+++ b/ansible/templates/docker-compose.yml
@@ -37,7 +37,7 @@ services:
iframely:
image: dogbin/iframely:latest
ports:
- - "127.0.0.1:8538:80"
+ - "127.0.0.1:8061:80"
volumes:
- ./iframely.config.local.js:/iframely/config.local.js:ro
restart: always
diff --git a/ansible/templates/nginx.conf b/ansible/templates/nginx.conf
index b96bbce7..68fa64fc 100644
--- a/ansible/templates/nginx.conf
+++ b/ansible/templates/nginx.conf
@@ -75,10 +75,14 @@ server {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+ if ($request_uri ~ \.(?:ico|gif|jpe?g|png|webp|bmp|mp4)$) {
+ add_header Cache-Control "public, max-age=31536000, immutable";
+ }
}
location /iframely/ {
- proxy_pass http://0.0.0.0:8538/;
+ proxy_pass http://0.0.0.0:8061/;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;