Browse Source

mastostart-gnu: Aggiunta %mastostart-services.

* mastostart-gnu/system/mastostart.scm (%mastostart-services): Nuova
  variabile.
Giacomo Leidi 4 years ago
parent
commit
79f28b641e
1 changed files with 32 additions and 33 deletions
  1. 32 33
      mastostart-gnu/system/mastostart.scm

+ 32 - 33
mastostart-gnu/system/mastostart.scm

@@ -42,6 +42,37 @@
     (file "modules/mod_proxy_fcgi.so"))
    %default-httpd-modules))
 
+(define-public %mastostart-services
+  (append
+   (list (service dhcp-client-service-type)
+
+         (mysql-service)
+
+         (service mastostart-service-type
+                  (mastostart-configuration
+                   (webroot %apache-webroot)))
+
+         (service openssh-service-type
+                  (openssh-configuration
+                   (port-number 10022)
+                   (permit-root-login #t)))
+
+         (service httpd-service-type
+                  (httpd-configuration
+                   (config
+                    (httpd-config-file
+                     (server-name %apache-server-name)
+                     (listen %apache-listen-ports)
+                     (document-root %apache-webroot)
+                     (modules %apache-modules)
+                     (extra-config (list %apache-conf))))))
+
+         (service php-fpm-service-type
+                  (php-fpm-configuration
+                   (socket "/var/run/php-fpm.sock")
+                   (socket-group "httpd"))))
+   %base-services))
+
 (define-public mastostart-conf
   (operating-system
     (locale "it_IT.utf8")
@@ -75,38 +106,6 @@
              "rsync"))
       %base-packages))
 
-    (services
-     (append
-      (list (service dhcp-client-service-type)
-
-            (mysql-service)
-
-            (service mastostart-service-type
-                     (mastostart-configuration
-                      (webroot %apache-webroot)))
-
-            (service openssh-service-type
-                     (openssh-configuration
-                      (port-number 10022)
-                      (permit-root-login #t)))
-
-            (service httpd-service-type
-                     (httpd-configuration
-                      (config
-                       (httpd-config-file
-                        (server-name %apache-server-name)
-                        (listen %apache-listen-ports)
-                        (document-root %apache-webroot)
-                        (modules %apache-modules)
-                        (extra-config (list %apache-conf))))))
-
-            (service php-fpm-service-type
-                     (php-fpm-configuration
-                      (socket "/var/run/php-fpm.sock")
-                      (socket-group "httpd")))
-
-            (extra-special-file "/usr/bin/env"
-                                (file-append coreutils "/bin/env")))
-      %base-services))))
+    (services %mastostart-services)))
 
 mastostart-conf