From 0a3eff0de0e040baa829fcb07047b79155ce0cf8 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Mon, 11 May 2020 22:31:16 +0200
Subject: [PATCH] OASIS + JUKEBOX

---
 .install/templates/copylaradio/mpd.conf |  2 +-
 www/LOVELand/index.html                 |  4 ++--
 www/loveland.conf                       | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.install/templates/copylaradio/mpd.conf b/.install/templates/copylaradio/mpd.conf
index 4fa6bc9..3b518f6 100644
--- a/.install/templates/copylaradio/mpd.conf
+++ b/.install/templates/copylaradio/mpd.conf
@@ -5,7 +5,7 @@ bind_to_address                 "any"
 auto_update                     "yes"
 zeroconf_enabled                "yes"
 zeroconf_name                   "CopyLaRadio Music Recorder"
-
+connection_timeout              "120"
 filesystem_charset              "UTF-8"
 id3v1_encoding                  "UTF-8"
 ###############################
diff --git a/www/LOVELand/index.html b/www/LOVELand/index.html
index 253bd14..3c63441 100644
--- a/www/LOVELand/index.html
+++ b/www/LOVELand/index.html
@@ -59,6 +59,8 @@
       <div class="container">
         <a class="btn btn-primary" href="./cesium/index.html" target="cesium">Cesium</a>
         <a class="btn btn-primary" href="./gchange/index.html" target="gchange">Gchange</a>
+        <a class="btn btn-primary" href="./jukebox/index.php" target="jukebox">Music</a>
+        <a class="btn btn-primary" href="./oasis" target="oasis">Oasis</a>
         <a class="btn btn-primary" href="./g1billet/test.php" target="g1billets">G1Billets</a>
       </div>
     </nav>
@@ -189,8 +191,6 @@
       <div class="container">
         <a class="btn btn-primary" href="./nextcloud" target="nextcloud">NextCloud</a>
         <a class="btn btn-primary" href="./minetest" target="minetest">Minetest</a>
-        <a class="btn btn-primary" href="./jukebox/index.php" target="jukebox">Music</a>
-        <a class="btn btn-primary" href="./oasis" target="oasis">Oasis</a>
         <a class="btn btn-primary" href="./ipfs" target="ipfs">IPFS</a>
       </div>
     </nav>
diff --git a/www/loveland.conf b/www/loveland.conf
index de8d924..f454f41 100644
--- a/www/loveland.conf
+++ b/www/loveland.conf
@@ -4,14 +4,19 @@ server {
     listen [::]:80;
 
     root /var/www/loveland;
-    index index.php index.html index.htm;
 
     server_name _SERVERNAME_;
 
-    # This section can be copied into an existing default setup
     location / {
         allow all;
-        index index.php;
+        index index.php index.html index.htm;
+        error_page 404 = /error/404.html;
+    }
+
+    # This section can be copied into an existing default setup
+    location /jukebox {
+        allow all;
+        index index.php index.html index.htm;
         location ~ \.php {
                 try_files $uri index.php =404;
                 fastcgi_pass unix:/var/run/php/php_PHPVERSION_-fpm.sock;
@@ -20,7 +25,7 @@ server {
                 include /etc/nginx/fastcgi_params;
                 fastcgi_read_timeout 1800;
         }
-        error_page 404 = /error/404.html;
+        error_page 404 = /error/404.php;
         try_files $uri $uri/ =404;
         location ~ /albumart/* {
                 expires -1s;