update git services and move social

Julien LepillerTue Oct 06 14:14:23+0200 2020

4abaa5f

update git services and move social

systems/ene.scm

3434 
3535 
(use-modules (config certbot) (config dns) (config iptables)
3636 
             (config mail) (config os) (config static-web)
37+
	     (config web)
3738 
	     (services gitile) (packages gitile))
3839 
3940 
;; Copy from (gnu bootloader u-boot)
…
9091 
        (certbot-service `(("courriel.lepiller.eu" "imap.lepiller.eu")
9192 
                           ("ene.lepiller.eu" "rennes.lepiller.eu")
9293 
                           ("avatar.lepiller.eu")
93-
                           ("git.lepiller.eu")))
94+
                           ("git.lepiller.eu")
95+
			   ("social.lepiller.eu")))
9496 
        (service nginx-service-type)
9597 
        (service php-fpm-service-type)
9698 
        (service fcgiwrap-service-type
…
113115 
                    "/etc/letsencrypt/live/ene.lepiller.eu/privkey.pem")
114116 
                  (listen '("443 ssl http2" "[::]:443 ssl http2"))
115117 
                  (server-name '(default))(root "/srv/http/default"))))
118+
        (simple-service 'social-http-server nginx-service-type
119+
          (list (nginx-server-configuration
120+
                  (ssl-certificate "/etc/letsencrypt/live/social.lepiller.eu/fullchain.pem")
121+
                  (ssl-certificate-key "/etc/letsencrypt/live/social.lepiller.eu/privkey.pem")
122+
                  (listen '("443 ssl http2" "[::]:443 ssl http2"))
123+
                  (server-name '("social.lepiller.eu"))
124+
                  (root "/srv/http/social/public")
125+
                  (locations
126+
                    (list
127+
		      (nginx-location-configuration
128+
			(uri "/content/")
129+
			(body '("alias /var/lib/social/user-data/public/;")))
130+
                      (nginx-location-configuration
131+
                        (uri "/")
132+
                        (body '("proxy_pass http://localhost:8081;")))))
133+
                  (raw-content default-web-policy))))
116134 
	(service gitile-service-type)
117135 
        (simple-service 'git-server nginx-service-type
118136 
          (list (nginx-server-configuration
…
161179 
            (rc-file
162180 
              (gitolite-rc-file
163181 
                (umask #o0027)
164-
                (git-config-keys "gitweb.*"))))))
182+
                (git-config-keys ".*"))))))
165183 
      (modify-services
166184 
        (lepiller-mail-services
167185 
          #:interface "eth0"
systems/hermes.scm
9292 
                   (zones (list lepiller-slave-zone
9393 
                                ipv4-reverse-master-zone
9494 
                                ipv6-reverse-master-zone))))
95-
        (certbot-service `(("lepiller.eu" "www.lepiller.eu" "smtp.lepiller.eu")
96-
                           ("social.lepiller.eu")))
95+
        (certbot-service `(("lepiller.eu" "www.lepiller.eu" "smtp.lepiller.eu")))
9796 
        (simple-service 'social-http-server nginx-service-type
9897 
          (list (nginx-server-configuration
9998 
                  (ssl-certificate "/etc/letsencrypt/live/social.lepiller.eu/fullchain.pem")