diff --git a/mastostart-gnu/system/mastostart.scm b/mastostart-gnu/system/mastostart.scm
index 1829246..7ef2b8a 100644
--- a/mastostart-gnu/system/mastostart.scm
+++ b/mastostart-gnu/system/mastostart.scm
@@ -15,8 +15,23 @@
ssh
web)
+(define-public %apache-listen-ports '("8080"))
+
+(define-public %apache-server-name "127.0.0.1")
+
(define-public %apache-webroot "/srv")
+(define-public %apache-conf
+ (string-append "
+
+ Options FollowSymLinks
+ AllowOverride All
+
+
+
+ SetHandler \"proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/\"
+"))
+
(define-public mastostart-conf
(operating-system
(locale "it_IT.utf8")
@@ -69,8 +84,8 @@
(httpd-configuration
(config
(httpd-config-file
- (server-name "127.0.0.1")
- (listen '("8080"))
+ (server-name %apache-server-name)
+ (listen %apache-listen-ports)
(document-root %apache-webroot)
(modules (cons*
(httpd-module
@@ -83,14 +98,7 @@
(name "proxy_fcgi_module")
(file "modules/mod_proxy_fcgi.so"))
%default-httpd-modules))
- (extra-config (list "\
-
- AllowOverride All
-
-
-
- SetHandler \"proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/\"
-"))))))
+ (extra-config (list %apache-conf))))))
(service php-fpm-service-type
(php-fpm-configuration