Update deployment configuration.

Author: Jamie Hanlon

Dockerfile

@@ -7,10 +7,10 @@ RUN apt-get update && \
     apt-get install -y gitweb fcgiwrap
 
 RUN ln -s /usr/share/gitweb /opt/www
+ADD gitweb.conf /etc/gitweb.conf
 
-RUN rm -v /etc/nginx/nginx.conf
+RUN rm /etc/nginx/nginx.conf
 ADD nginx.conf /etc/nginx
-ADD gitweb.conf /etc/gitweb.conf
 
 CMD spawn-fcgi -s /var/run/fcgiwrap.socket /usr/sbin/fcgiwrap && \
     nginx "-g" "daemon off;"

nginx.conf

@@ -11,22 +11,29 @@ events {
 http {
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
+  #include /etc/nginx/fastcgi.conf;
   sendfile on;
   gzip off;
   keepalive_timeout 65;
 
   server {
     listen 80;
     root /opt/www;
+    charset utf-8;
     location / {
-      fastcgi_pass unix:/var/run/fcgiwrap.socket;
+      try_files $uri @gitweb;
+    }
+    location @gitweb {
       fastcgi_param SCRIPT_FILENAME /opt/www/gitweb.cgi;
       fastcgi_param PATH_INFO       $uri;
       fastcgi_param GITWEB_CONFIG   /etc/gitweb.conf;
       include fastcgi_params;
+      fastcgi_pass unix:/var/run/fcgiwrap.socket;
+      fastcgi_index gitweb.cgi;
       gzip off;
     }
-    location /static {
-    }
+    #location /static {
+    #  root /opt/www/static;
+    #}
   }
 }