summaryrefslogtreecommitdiff
path: root/guix/etc/nginx
diff options
context:
space:
mode:
authorNils Gillmann <ng0@n0.is>2018-10-29 19:17:35 +0000
committerNils Gillmann <ng0@n0.is>2018-10-29 19:17:35 +0000
commit5c311e83d5013f6593c32fcf2f9b8cc87efb61cd (patch)
tree4a7fbab8f7b315f34b65ffaa2e1aa7225ded2e77 /guix/etc/nginx
parentf1c273919635c0c4d92e98e95a7bb6bc7d28fa90 (diff)
downloaddeployment-5c311e83d5013f6593c32fcf2f9b8cc87efb61cd.tar.gz
deployment-5c311e83d5013f6593c32fcf2f9b8cc87efb61cd.tar.bz2
deployment-5c311e83d5013f6593c32fcf2f9b8cc87efb61cd.zip
fix
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'guix/etc/nginx')
-rw-r--r--guix/etc/nginx/nginx.conf4
-rw-r--r--guix/etc/nginx/sites-enabled/git-ssl.site43
2 files changed, 40 insertions, 7 deletions
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;
+# }
+# }