diff options
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/config.scm | 53 | ||||
| -rw-r--r-- | guix/taler-helpers.scm | 2 |
2 files changed, 26 insertions, 29 deletions
diff --git a/guix/config.scm b/guix/config.scm index 0f8ae2d..663bf87 100644 --- a/guix/config.scm +++ b/guix/config.scm @@ -14,6 +14,8 @@ ;;; You should have received a copy of the GNU Affero General Public License ;;; along with GNU Taler. If not, see <http://www.gnu.org/licenses/>. +;; Load modules relative to the script name. +(set! %load-path (cons ((@ (guix utils) current-source-directory)) %load-path)) (use-modules (srfi srfi-1) @@ -21,12 +23,8 @@ (gnu) (guix) (guix utils) - (guix gexp)) - -;; Load modules relative to the script name. -(set! %load-path (cons (current-source-directory) %load-path)) - -(use-modules (taler-helpers)) + (guix gexp) + (taler-helpers) (use-system-modules nss) (use-service-modules networking ssh version-control cgit databases admin web) @@ -42,28 +40,27 @@ ;;; this should eventually go upstream. ;;; -(define my-fcgiwrap-shepherd-service - (match-lambda - (($ <fcgiwrap-configuration> package socket user group) - (list (shepherd-service - (provision '(fcgiwrap)) - (documentation "Run the fcgiwrap daemon.") - (requirement '(networking)) - (start #~(make-forkexec-constructor - '(#$(file-append package "/sbin/fcgiwrap") - "-s" #$socket) - #:user #$user #:group #$group)) - (stop #~(make-kill-destructor))))))) - -(define my-fcgiwrap-service-type - (service-type (name 'fcgiwrap) - (extensions - (list (service-extension shepherd-root-service-type - my-fcgiwrap-shepherd-service) - (service-extension account-service-type - fcgiwrap-accounts))) - (default-value (fcgiwrap-configuration)))) - +;(define my-fcgiwrap-shepherd-service +; (match-lambda +; (($ <fcgiwrap-configuration> package socket user group) +; (list (shepherd-service +; (provision '(fcgiwrap)) +; (documentation "Run the fcgiwrap daemon.") +; (requirement '(networking)) +; (start #~(make-forkexec-constructor +; '(#$(file-append package "/sbin/fcgiwrap") +; "-s" #$socket) +; #:user #$user #:group #$group)) +; (stop #~(make-kill-destructor))))))) +; +;(define my-fcgiwrap-service-type +; (service-type (name 'fcgiwrap) +; (extensions +; (list (service-extension shepherd-root-service-type +; my-fcgiwrap-shepherd-service) +; (service-extension account-service-type +; fcgiwrap-accounts))) +; (default-value (fcgiwrap-configuration)))) diff --git a/guix/taler-helpers.scm b/guix/taler-helpers.scm index bf2db01..e40c1f5 100644 --- a/guix/taler-helpers.scm +++ b/guix/taler-helpers.scm @@ -1,4 +1,4 @@ -(define-module taler-helpers +(define-module (taler-helpers) #:use-module (guix) #:use-module (guix utils) #:export (concat-local-files)) |