diff options
| author | Florian Dold <florian.dold@gmail.com> | 2018-10-30 12:28:57 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2018-10-30 12:28:57 +0100 |
| commit | 4941911e1acd1de5ac43616b5a407671fb4fd805 (patch) | |
| tree | d80ab46471db46385b6f6e1fc487d89c582de488 | |
| parent | c34ea81f6585e0ae9902d8fcdb6a9ebbb9a6c57f (diff) | |
| download | deployment-4941911e1acd1de5ac43616b5a407671fb4fd805.tar.gz deployment-4941911e1acd1de5ac43616b5a407671fb4fd805.tar.bz2 deployment-4941911e1acd1de5ac43616b5a407671fb4fd805.zip | |
nginx config for git, disable cgit for now
| -rw-r--r-- | guix/config.scm | 6 | ||||
| -rw-r--r-- | guix/etc/nginx/sites-enabled/git-ssl.site | 52 |
2 files changed, 12 insertions, 46 deletions
diff --git a/guix/config.scm b/guix/config.scm index 9b8b5d2..02fad1b 100644 --- a/guix/config.scm +++ b/guix/config.scm @@ -205,9 +205,9 @@ (service fcgiwrap-service-type (fcgiwrap-configuration (socket "unix:/var/run/fcgiwrap.socket"))) - (service cgit-service-type - (opaque-cgit-configuration - (cgitrc "/etc/deployment/guix/etc/cgitrc"))) + ;(service cgit-service-type + ; (opaque-cgit-configuration + ; (cgitrc "/etc/deployment/guix/etc/cgitrc"))) (service nginx-service-type (nginx-configuration (file (file-append %nginx-config diff --git a/guix/etc/nginx/sites-enabled/git-ssl.site b/guix/etc/nginx/sites-enabled/git-ssl.site index ae54886..ea7cf0f 100644 --- a/guix/etc/nginx/sites-enabled/git-ssl.site +++ b/guix/etc/nginx/sites-enabled/git-ssl.site @@ -1,20 +1,19 @@ server { - listen 80; - listen [::]:80; ## listen for ipv4; this line is default and implied - # listen [::]:80 default_server ipv6only=on; ## listen for ipv6 + listen 443 ssl; + listen [::]:443 ssl; ## listen for ipv4; this line is default and implied root /srv/git; - server_name git.taler.net; + server_name git.taler.net; + include conf.d/talerssl; - #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; 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_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; } @@ -24,41 +23,8 @@ server { location / { include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME /run/current-system/profile/lib/cgit.cgi; - fastcgi_param PATH_INFO $uri; + fastcgi_param SCRIPT_FILENAME /run/current-system/profile/lib/cgit.cgi; + fastcgi_param PATH_INFO $uri; 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; -# } -# } |