unify configs, split your-spotify config

sarvesh-lad · Oct 17, 2023 · 0558de6 · 0558de6
1 parent 45ba5a8
commit 0558de6
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 62 deletions.
diff --git a/linkace.subdomain.conf.sample b/linkace.subdomain.conf.sample
@@ -9,9 +9,6 @@ server {
 
     server_name linkace.*;
 
-    # enable to indicate to search engines to not index this site
-    # add_header X-Robots-Tag "noindex, nofollow, nosnippet, noarchive";
-
     include /config/nginx/ssl.conf;
 
     client_max_body_size 0;

diff --git a/storm.subdomain.conf.sample b/storm.subdomain.conf.sample
@@ -10,9 +10,6 @@ server {
 
     server_name storm.*;
 
-    # enable to indicate to search engines to not index this site
-    # add_header X-Robots-Tag "noindex, nofollow, nosnippet, noarchive";
-
     include /config/nginx/ssl.conf;
 
     client_max_body_size 0;

diff --git a/your-spotify-api.subdomain.conf.sample b/your-spotify-api.subdomain.conf.sample
@@ -0,0 +1,51 @@
+## Version 2023/10/17
+# https://github.com/Yooooomi/your_spotify
+# this is not a standalone config, it requires configured your-spotify web container for full functionality. 
+# it uses server URLs for api callbacks, thus a server is required
+# make sure that your YourSpotify api container is named your-spotify-server
+# make sure that your dns has a cname set for your-spotify-server
+# do not forget to finish configuration following instructions in apps repository. API_ENDPOINT=https://your-spotify-server.[your domain].
+
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name your-spotify-server.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth (requires ldap-location.conf in the location block)
+    #include /config/nginx/ldap-server.conf;
+
+    # enable for Authelia (requires authelia-location.conf in the location block)
+    #include /config/nginx/authelia-server.conf;
+
+    # enable for Authentik (requires authentik-location.conf in the location block)
+    #include /config/nginx/authentik-server.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable for ldap auth (requires ldap-server.conf in the server block)
+        #include /config/nginx/ldap-location.conf;
+
+        # enable for Authelia (requires authelia-server.conf in the server block)
+        #include /config/nginx/authelia-location.conf;
+
+        # enable for Authentik (requires authentik-server.conf in the server block)
+        #include /config/nginx/authentik-location.conf;
+
+        include /config/nginx/proxy.conf;
+        include /config/nginx/resolver.conf;
+        set $upstream_app your-spotify-server;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+
+}
diff --git a/your-spotify.subdomain.conf.sample b/your-spotify.subdomain.conf.sample
@@ -1,19 +1,16 @@
-## Version 2023/09/29
+## Version 2023/10/17
 # https://github.com/Yooooomi/your_spotify
-# this app requires separate server and web containers. It uses web and server URLs for api callbacks, thus a double config is required.
-# make sure that your YourSpotify client container is named your-spotify-web
-# make sure that your YourSpotify server container is named your-spotify-server
-# make sure that your dns has a cname set for your-spotify and your-spotify-server
-# do not forget to finish configuration following instructions in apps repository. CLIENT_ENDPOINT=https://your-spotify.[your domain]; API_ENDPOINT=https://your-spotify-server.[your domain].
+# this is not a standalone config, it requires configured your-spotify api container for full functionality. 
+# it uses server URLs for api callbacks, thus a server is required
+# make sure that your YourSpotify web container is named your-spotify-web
+# make sure that your dns has a cname set for your-spotify
+# do not forget to finish configuration following instructions in apps repository. CLIENT_ENDPOINT=https://your-spotify.[your domain]
 
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
 
-    server_name  your-spotify.*;
-
-    # enable to indicate to search engines to not index this site
-    #add_header X-Robots-Tag "noindex, nofollow, nosnippet, noarchive";
+    server_name your-spotify.*;
 
     include /config/nginx/ssl.conf;
 
@@ -54,49 +51,3 @@ server {
 }
 
 
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-
-    server_name  your-spotify-server.*;
-
-    # enable to indicate to search engines to not index this site
-    #add_header X-Robots-Tag "noindex, nofollow, nosnippet, noarchive";
-
-    include /config/nginx/ssl.conf;
-
-    client_max_body_size 0;
-
-    # enable for ldap auth (requires ldap-location.conf in the location block)
-    #include /config/nginx/ldap-server.conf;
-
-    # enable for Authelia (requires authelia-location.conf in the location block)
-    #include /config/nginx/authelia-server.conf;
-
-    # enable for Authentik (requires authentik-location.conf in the location block)
-    #include /config/nginx/authentik-server.conf;
-
-    location / {
-        # enable the next two lines for http auth
-        #auth_basic "Restricted";
-        #auth_basic_user_file /config/nginx/.htpasswd;
-
-        # enable for ldap auth (requires ldap-server.conf in the server block)
-        #include /config/nginx/ldap-location.conf;
-
-        # enable for Authelia (requires authelia-server.conf in the server block)
-        #include /config/nginx/authelia-location.conf;
-
-        # enable for Authentik (requires authentik-server.conf in the server block)
-        #include /config/nginx/authentik-location.conf;
-
-        include /config/nginx/proxy.conf;
-        include /config/nginx/resolver.conf;
-        set $upstream_app your-spotify-server;
-        set $upstream_port 8080;
-        set $upstream_proto http;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-    }
-
-}