[GNUnet-SVN] [taler-deployment] branch master updated (220f0dc -> 1af07cc)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository deployment.

    from 220f0dc  config: socket.
     new b07c317  config: cgit service
     new 1af07cc  gv.taler->git.taler (nginx)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 guix/config.scm                           | 6 +++---
 guix/etc/nginx/sites-enabled/git-ssl.site | 3 +--
 guix/etc/nginx/sites-enabled/git.site     | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/guix/config.scm b/guix/config.scm
index 8b897cb..f56ba27 100644
--- a/guix/config.scm
+++ b/guix/config.scm
@@ -200,9 +200,9 @@
              (service fcgiwrap-service-type
                       (fcgiwrap-configuration
                        (socket "unix:/var/run/fcgiwrap.socket")))
-             ;; (service cgit-service-type
-             ;;          (opaque-cgit-configuration
-             ;;           (cgitrc "/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 a0c02f0..f352cd5 100644
--- a/guix/etc/nginx/sites-enabled/git-ssl.site
+++ b/guix/etc/nginx/sites-enabled/git-ssl.site
@@ -4,8 +4,7 @@ server {
        # listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
 
        root /srv/git;
-       #server_name git.taler.net;
-        server_name gv.taler.net;
+        server_name git.taler.net;
         include conf.d/talerssl;
         
         access_log /var/log/nginx/git.taler.net_access.log;
diff --git a/guix/etc/nginx/sites-enabled/git.site 
b/guix/etc/nginx/sites-enabled/git.site
index b9b9fc4..e10fcc6 100644
--- a/guix/etc/nginx/sites-enabled/git.site
+++ b/guix/etc/nginx/sites-enabled/git.site
@@ -4,8 +4,7 @@ server {
        # listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
 
        root /srv/git;
-       #server_name git.taler.net;
-        server_name gv.taler.net;
+       server_name git.taler.net;
 
        rewrite ^ https://$server_name$request_uri? permanent;
 }

-- 
To stop receiving notification emails like this one, please contact
address@hidden