diff --git a/nixos/linux.nix b/nixos/linux.nix index 57720ab..4f3aea1 100644 --- a/nixos/linux.nix +++ b/nixos/linux.nix @@ -187,6 +187,14 @@ in { ports = ["9090:8080"]; user = "0"; # run as root }; + + "blog-quine" = { + autoStart = true; + image = "quineglobal/blog-quine@sha256:"; + volumes = []; + environment = {}; + ports = ["3010:8080"]; + }; }; }; diff --git a/nixos/nginx.nix b/nixos/nginx.nix index 69acb86..043802c 100644 --- a/nixos/nginx.nix +++ b/nixos/nginx.nix @@ -74,40 +74,8 @@ root = "/etc/pullomatic/com_quinefoundation_blog/markdown-blog"; - locations."~ /.git(/.*)$ " = { - extraConfig = '' - deny all; - return 404; - ''; - }; - - locations."~ ^/static(/.*)?$" = { - extraConfig = '' - autoindex on; - root /etc/pullomatic/com_quinefoundation_blog/static; - rewrite ^/static(?(/[^/\\s]*)*)$ "$query" break; - ''; - }; - locations."/" = { - extraConfig = '' - rewrite ^/?$ /blog-posts-list.php last; - rewrite ^/post/?$ /blog-posts-list.php last; - rewrite ^/about/?$ /about.php last; - rewrite ^/credits/?$ /credits.php last; - rewrite ^/post/([-a-zA-Z0-9]*)$ /blog-page.php?page=$1.md last; - rewrite ^/rss.xml$ /rss.php last; - try_files $uri $uri/ =404; - index index.php index.html index.htm; - ''; - }; - - locations."~ \.php$" = { - extraConfig = '' - include ${pkgs.nginx}/conf/fastcgi.conf; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${config.services.phpfpm.pools.main.socket}; - ''; + proxyPass = "http://127.0.0.1:3010/"; # pass through to docker container }; };