conf.d

custom/proxy/Dockerfile

@@ -1,4 +1,5 @@
 FROM nginxproxy/nginx-proxy:latest
 
 COPY config/vhost.d/* /etc/nginx/vhost.d/
+COPY config/conf.d/* /etc/nginx/conf.d/
 COPY config/nginx.conf /etc/nginx/nginx.conf 

custom/proxy/config/conf.d/default.conf

@@ -0,0 +1,43 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}

custom/proxy/config/conf.d/redirect-git.conf

@@ -0,0 +1,6 @@
+server {
+    listen 80;
+    listen 443 ssl;
+    server_name "git.faulty.nl";
+    return 301 https://git.ixvd.net$request_uri;
+}

docker-compose.devops.yml

@@ -23,17 +23,6 @@ services:
     ports:
       - "2222:22"
 
-  redirect:
-    image: adamkdean/redirect
-    environment:
-      - VIRTUAL_HOST=git.faulty.nl
-      - LETSENCRYPT_HOST=git.faulty.nl
-      - REDIRECT_LOCATION="https://git.ixvd.net"
-      - REDIRECT_STATUS_CODE=301
-      - PRESERVE_URL=true
-    networks:
-      - proxy
-
   gitlab:
     image: gitlab/gitlab-ce:latest
     restart: always