mastostart-gnu: Esporta completamente la configurazione di Apache.

* mastostart-gnu/system/mastostart.scm: Nuove variabili e valori di
  default per la configurazione Release.

mastostart-gnu/system/mastostart.scm

@@ -4,9 +4,6 @@
   #:use-module (gnu packages databases)
   #:use-module (guix packages)
   #:use-module (guix build syscalls)
-  #:use-module (guix monads)
-  #:use-module (guix store)
-  #:use-module (guix gexp)
   #:use-module (mastostart-gnu services mastostart))
 
 (use-service-modules databases
@@ -15,7 +12,7 @@
                      ssh
                      web)
 
-(define-public %apache-listen-ports '("8080"))
+(define-public %apache-listen-ports '("80"))
 
 (define-public %apache-server-name "127.0.0.1")
 
@@ -32,6 +29,19 @@
     SetHandler \"proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/\"
 </FilesMatch>"))
 
+(define-public %apache-modules
+  (cons*
+   (httpd-module
+    (name "rewrite_module")
+    (file "modules/mod_rewrite.so"))
+   (httpd-module
+    (name "proxy_module")
+    (file "modules/mod_proxy.so"))
+   (httpd-module
+    (name "proxy_fcgi_module")
+    (file "modules/mod_proxy_fcgi.so"))
+   %default-httpd-modules))
+
 (define-public mastostart-conf
   (operating-system
     (locale "it_IT.utf8")
@@ -87,17 +97,7 @@
                         (server-name %apache-server-name)
                         (listen %apache-listen-ports)
                         (document-root %apache-webroot)
-                        (modules (cons*
-                                  (httpd-module
-                                   (name "rewrite_module")
-                                   (file "modules/mod_rewrite.so"))
-                                  (httpd-module
-                                   (name "proxy_module")
-                                   (file "modules/mod_proxy.so"))
-                                  (httpd-module
-                                   (name "proxy_fcgi_module")
-                                   (file "modules/mod_proxy_fcgi.so"))
-                                  %default-httpd-modules))
+                        (modules %apache-modules)
                         (extra-config (list %apache-conf))))))
 
             (service php-fpm-service-type