Modify Dockerfile and the nginx.conf file to avoid Nginx default conf… (#203)

* Modify Dockerfile and the nginx.conf file to avoid Nginx default config IPv6 conflict.

* Adjust nginx.conf name and run.sh nginx modification.

* but nginx.conf file back

Co-authored-by: simon <simobilleter@gmail.com>

Dockerfile

@@ -44,7 +44,7 @@ COPY ./tubearchivist/requirements.txt /requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt --src /usr/local/src
 
 # copy config files
-COPY docker_assets/nginx.conf /etc/nginx/conf.d/
+COPY docker_assets/nginx.conf /etc/nginx/sites-available/default
 
 # copy application into container
 COPY ./tubearchivist /app

docker_assets/nginx.conf

@@ -1,30 +1,29 @@
 server {
 
     listen 8000;
-
+    
     location /cache/videos/ {
         alias /cache/videos/;
     }
-
+    
     location /cache/channels/ {
         alias /cache/channels/;
     }
-
+    
     location /cache/playlists/ {
         alias /cache/playlists/;
     }
-
+    
     location /media/ {
         alias /youtube/;
-
         types {
             text/vtt vtt;
         }
     }
-
+    
     location / {
         include uwsgi_params;
         uwsgi_pass localhost:8080;
     }
-
+    
 }

docker_assets/run.sh

@@ -15,11 +15,11 @@ done
 
 # ugly nginx and uwsgi port overwrite with env vars
 if [[ -n "$TA_PORT" ]]; then
-    sed -i "s/8000/$TA_PORT/g" /etc/nginx/conf.d/nginx.conf
+    sed -i "s/8000/$TA_PORT/g" /etc/nginx/sites-available/default
 fi
 
 if [[ -n "$TA_UWSGI_PORT" ]]; then
-    sed -i "s/8080/$TA_UWSGI_PORT/g" /etc/nginx/conf.d/nginx.conf
+    sed -i "s/8080/$TA_UWSGI_PORT/g" /etc/nginx/sites-available/default
     sed -i "s/8080/$TA_UWSGI_PORT/g" /app/uwsgi.ini
 fi