Merge pull request #101 from YunoHost-Apps/testing

Testing v0.11.1~ynh4

README.md

@@ -25,7 +25,7 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share
 Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Shipped version:** 0.11.1~ynh3
+**Shipped version:** 0.11.1~ynh4
 
 ## Screenshots
 

README_fr.md

@@ -25,7 +25,7 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p
 Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Version incluse :** 0.11.1~ynh3
+**Version incluse :** 0.11.1~ynh4
 
 ## Captures d’écran
 

conf/nginx.conf

@@ -1,15 +1,50 @@
 location __PATH__/ {
 
   proxy_http_version 1.1;
+  proxy_set_header Host $host;
   proxy_set_header Upgrade $http_upgrade;
   proxy_set_header Connection "upgrade";
+  proxy_set_header X-Forwarded-For $remote_addr;
+  proxy_set_header X-Forwarded-Proto $scheme;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  proxy_set_header Host $host;
 
-  proxy_pass http://localhost:__PORT__;
+  proxy_pass http://127.0.0.1:__PORT__;
 
   client_max_body_size __CLIENT_MAX_BODY_SIZE__;
 
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
+
+
+  # fix "[warn] could not build optimal proxy_headers_hash error"
+  proxy_headers_hash_max_size 512;
+  proxy_headers_hash_bucket_size 128;
+
+
+  # media caching stuff
+  # https://docs.gotosocial.org/en/latest/advanced/caching/assets-media/#nginx
+  location /assets/ {
+    alias __FINAL_PATH__/web/assets/;
+    autoindex off;
+    # 300 = 5 minutes
+    more_set_headers "Cache-control: public, max-age=300";
+  }
+
+  location /fileserver/ {
+    alias /home/yunohost.app/__APP__/;
+    autoindex off;
+    # 604800 = 1 week
+    more_set_headers "Cache-Control: private, immutable, max-age=604800";
+    try_files $uri @fileserver;
+  }
+
+}
+
+location @fileserver {
+  proxy_pass http://127.0.0.1:__PORT__;
+  proxy_set_header Host $host;
+  proxy_set_header Upgrade $http_upgrade;
+  proxy_set_header Connection "upgrade";
+  proxy_set_header X-Forwarded-For $remote_addr;
+  proxy_set_header X-Forwarded-Proto $scheme;
 }

manifest.json

@@ -6,7 +6,7 @@
         "en": "ActivityPub social network server",
         "fr": "Serveur de réseau social basé sur ActivityPub"
     },
-    "version": "0.11.1~ynh3",
+    "version": "0.11.1~ynh4",
     "url": "https://github.com/superseriousbusiness/gotosocial",
     "upstream": {
         "license": "AGPL-3.0-only",

scripts/install

@@ -307,9 +307,12 @@ yunohost service add "$app" --description="Gotosocial server" --log="/var/log/$a
 #=================================================
 ynh_script_progression --message="Creating gotosocial admin user..." --weight=1
 
-"$final_path"/gotosocial --config-path "$final_path/config.yaml" admin account create --username "$admin" --email "$email" --password "$password"
+# using "/var/www/$app" instead of "$final_path" as a temporary workaround for this bug:
+# bad_ynh_exec_syntax() false positive: https://github.com/YunoHost/package_linter/issues/123
 
-"$final_path"/gotosocial --config-path "$final_path/config.yaml" admin account promote --username "$admin"
+ynh_exec_warn_less /var/www/"$app"/gotosocial --config-path "$final_path/config.yaml" admin account create --username "$admin" --email "$email" --password "$password"
+
+ynh_exec_warn_less /var/www/"$app"/gotosocial --config-path "$final_path/config.yaml" admin account promote --username "$admin"
 
 #=================================================
 # START SYSTEMD SERVICE