diff options
| -rw-r--r-- | guix/config.scm | 4 | ||||
| -rw-r--r-- | guix/etc/nginx/nginx.conf | 4 | ||||
| -rw-r--r-- | guix/etc/nginx/sites-enabled/git-ssl.site | 43 |
3 files changed, 42 insertions, 9 deletions
diff --git a/guix/config.scm b/guix/config.scm index 9bcfd6e..9b8b5d2 100644 --- a/guix/config.scm +++ b/guix/config.scm @@ -44,8 +44,8 @@ (copy-file #$(local-file "etc/nginx/conf.d/talerssl") "conf.d/talerssl") (mkdir "sites-enabled") - (copy-file #$(local-file "etc/nginx/sites-enabled/git.site") - "sites-enabled/git.site") + ;; (copy-file #$(local-file "etc/nginx/sites-enabled/git.site") + ;; "sites-enabled/git.site") (copy-file #$(local-file "etc/nginx/sites-enabled/git-ssl.site") "sites-enabled/git-ssl.site") (copy-file #$(local-file "etc/nginx/sites-enabled/default.site") diff --git a/guix/etc/nginx/nginx.conf b/guix/etc/nginx/nginx.conf index 3404e39..4b5de00 100644 --- a/guix/etc/nginx/nginx.conf +++ b/guix/etc/nginx/nginx.conf @@ -77,6 +77,6 @@ http { # Virtual Host Configs ## - include /etc/nginx/conf.d/*.conf; - include /etc/nginx/sites-enabled/*.site; + include conf.d/*.conf; + include sites-enabled/*.site; } diff --git a/guix/etc/nginx/sites-enabled/git-ssl.site b/guix/etc/nginx/sites-enabled/git-ssl.site index f352cd5..ae54886 100644 --- a/guix/etc/nginx/sites-enabled/git-ssl.site +++ b/guix/etc/nginx/sites-enabled/git-ssl.site @@ -1,12 +1,12 @@ server { - listen 443 ssl; - listen [::]:443 ssl; ## listen for ipv4; this line is default and implied + listen 80; + listen [::]:80; ## listen for ipv4; this line is default and implied # listen [::]:80 default_server ipv6only=on; ## listen for ipv6 root /srv/git; - server_name git.taler.net; - include conf.d/talerssl; - + server_name git.taler.net; + + #rewrite ^ https://$server_name$request_uri? permanent; access_log /var/log/nginx/git.taler.net_access.log; error_log /var/log/nginx/git.taler.net_error.log notice; @@ -29,3 +29,36 @@ server { fastcgi_pass unix:/var/run/fcgiwrap.socket; } } + + +# server { +# listen 443 ssl; +# listen [::]:443 ssl; ## listen for ipv4; this line is default and implied +# # listen [::]:80 default_server ipv6only=on; ## listen for ipv6 + +# root /srv/git; +# server_name git.taler.net; +# include conf.d/talerssl; + +# access_log /var/log/nginx/git.taler.net_access.log; +# error_log /var/log/nginx/git.taler.net_error.log notice; + +# location ~ ^(.*?)\.git/(HEAD|info/refs|objects/.*|git-upload-pack)$ { +# include /etc/nginx/fastcgi_params; +# fastcgi_param SCRIPT_FILENAME /run/current-system/profile/libexec/git-core/git-http-backend; +# fastcgi_param GIT_PROJECT_ROOT /home/git/repositories; +# fastcgi_param PATH_INFO $uri; +# fastcgi_pass unix:/var/run/fcgiwrap.socket; +# } + +# location /cgit { +# root /var/www; +# } + +# location / { +# include /etc/nginx/fastcgi_params; +# fastcgi_param SCRIPT_FILENAME /run/current-system/profile/lib/cgit.cgi; +# fastcgi_param PATH_INFO $uri; +# fastcgi_pass unix:/var/run/fcgiwrap.socket; +# } +# } |