Fixing some front end pictshare to pictrs conversions.

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'

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

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;

docker/dev/docker-compose.yml

@@ -1,22 +1,13 @@
 version: '3.3'
 
 services:
-  nginx:
-    image: nginx:1.19-alpine
-    ports:
-      - "8536:8536"
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
-    depends_on:
-      - lemmy
-      - pictrs
-      - iframely
-    restart: "always"
 
   lemmy:
     build: 
       context: ../../
       dockerfile: docker/dev/Dockerfile
+    ports:
+      - "127.0.0.1:8536:8536"
     restart: always
     environment:
       - RUST_LOG=debug
@@ -37,7 +28,9 @@ services:
     restart: always
 
   pictrs:
-    image: asonix/pictrs:amd64-v0.1.0-r9
+    image: asonix/pictrs:v0.1.0-r13
+    ports: 
+      - "127.0.0.1:8537:8080"
     user: 991:991
     volumes:
       - ./volumes/pictrs:/mnt
@@ -45,6 +38,8 @@ services:
 
   iframely:
     image: dogbin/iframely:latest
+    ports:
+      - "127.0.0.1:8061:80"
     volumes:
       - ../iframely.config.local.js:/iframely/config.local.js:ro
     restart: always