[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: services: Export *-service-type and *-configuration.
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: services: Export *-service-type and *-configuration. |
|
Date: |
Thu, 21 Jul 2016 16:54:15 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 24e964314ecfd29b8c592bfb7be923e8f740574c
Author: Tomáš Čech <address@hidden>
Date: Tue Jul 19 15:19:14 2016 +0200
services: Export *-service-type and *-configuration.
This allows users to use 'modify-services' and similar constructs for
all these service types.
* gnu/services/avahi.scm: export avahi-configuration.
* gnu/services/base.scm: export gpm-configuration and
rngd-configuration.
* gnu/services/databases.scm: export *-service-type and *-configuration.
* gnu/services/dbus.scm: export dbus-configuration.
* gnu/services/dict.scm: export dicod-service-type.
* gnu/services/lirc.scm: export lirc-configuration and
lirc-service-type.
* gnu/services/mail.scm: export dovecot-service-type.
* gnu/services/web.scm: export nginx-configuration and
nginx-service-type.
* gnu/services/xorg.scm: export screen-locker and screen-locker?.
* gnu/services/ssh.scm: export lsh-configuration and lsh-service-type.
* gnu/services/desktop.scm: export *-service, *-service-type
and *-configuration.
* gnu/services/networking.scm: export *-configuration
and *-service-type.
Co-authored-by: Ludovic Courtès <address@hidden>
---
gnu/services/avahi.scm | 3 ++-
gnu/services/base.scm | 6 ++++++
gnu/services/databases.scm | 10 ++++++++--
gnu/services/dbus.scm | 4 +++-
gnu/services/desktop.scm | 31 ++++++++++++++++++++++++++++++-
gnu/services/dict.scm | 1 +
gnu/services/lirc.scm | 7 +++++--
gnu/services/mail.scm | 1 +
gnu/services/networking.scm | 15 +++++++++++++++
gnu/services/ssh.scm | 5 ++++-
gnu/services/web.scm | 7 +++++--
gnu/services/xorg.scm | 2 ++
12 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index 562005c..807cc05 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -26,7 +26,8 @@
#:use-module (gnu packages admin)
#:use-module (guix records)
#:use-module (guix gexp)
- #:export (avahi-service
+ #:export (avahi-configuration
+ avahi-service
avahi-service-type))
;;; Commentary:
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 805ba7d..4474ce7 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -94,11 +94,17 @@
guix-publish-configuration?
guix-publish-service
guix-publish-service-type
+
+ gpm-configuration
+ gpm-configuration?
gpm-service-type
gpm-service
urandom-seed-service-type
urandom-seed-service
+
+ rngd-configuration
+ rngd-configuration?
rngd-service-type
rngd-service
pam-limits-service-type
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index e136d1e..86847f8 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -27,9 +27,15 @@
#:use-module (guix records)
#:use-module (guix gexp)
#:use-module (ice-9 match)
- #:export (postgresql-service
+ #:export (postgresql-configuration
+ postgresql-configuration?
+ postgresql-service
+ postgresql-service-type
+
mysql-service
- mysql-configuration))
+ mysql-service-type
+ mysql-configuration
+ mysql-configuration?))
;;; Commentary:
;;;
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 6ef1356..690561c 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -27,7 +27,9 @@
#:use-module (guix records)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
- #:export (dbus-root-service-type
+ #:export (dbus-configuration
+ dbus-configuration?
+ dbus-root-service-type
dbus-service))
;;;
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 86214a7..bf21707 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -45,18 +45,47 @@
#:use-module (guix gexp)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
- #:export (upower-service
+ #:export (upower-configuration
+ upower-configuration?
+ upower-service
+ upower-service-type
+
+ udisks-configuration
+ udisks-configuration?
udisks-service
+ udisks-service-type
+
colord-service
+
geoclue-application
+ geoclue-configuration
+ geoclue-configuration?
%standard-geoclue-applications
geoclue-service
+ geoclue-service-type
+
bluetooth-service
+
+ polkit-configuration
+ polkit-configuration?
polkit-service
+ polkit-service-type
+
elogind-configuration
+ elogind-configuration?
elogind-service
+ elogind-service-type
+
+ gnome-desktop-configuration
+ gnome-desktop-configuration?
gnome-desktop-service
+ gnome-desktop-service-type
+
+ xfce-desktop-configuration
+ xfce-desktop-configuration?
xfce-desktop-service
+ xfce-desktop-service-type
+
%desktop-services))
;;; Commentary:
diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm
index 9c06d57..b06922c 100644
--- a/gnu/services/dict.scm
+++ b/gnu/services/dict.scm
@@ -30,6 +30,7 @@
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
#:export (dicod-service
+ dicod-service-type
dicod-configuration
dicod-database
%dicod-database:gcide))
diff --git a/gnu/services/lirc.scm b/gnu/services/lirc.scm
index 069084a..e95f542 100644
--- a/gnu/services/lirc.scm
+++ b/gnu/services/lirc.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Alex Kost <address@hidden>
-;;; Copyright © 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2015, 2016 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,7 +24,10 @@
#:use-module (guix gexp)
#:use-module (guix records)
#:use-module (ice-9 match)
- #:export (lirc-service))
+ #:export (lirc-configuration
+ lirc-configuation?
+ lirc-service
+ lirc-service-type))
;;; Commentary:
;;;
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index 4bd1b96..c252d66 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -37,6 +37,7 @@
dovecot-configuration-error?
dovecot-service
+ dovecot-service-type
dovecot-configuration
opaque-dovecot-configuration
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index a77ed3b..71f49a0 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -39,13 +39,28 @@
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
#:export (%facebook-host-aliases
+ static-networking
static-networking-service
+ static-networking-service-type
dhcp-client-service
%ntp-servers
+
+ ntp-configuration
+ ntp-configuration?
ntp-service
+ ntp-service-type
+
+ tor-configuration
+ tor-configuration?
tor-hidden-service
tor-service
+ tor-service-type
+
+ bitlbee-configuration
+ bitlbee-configuration?
bitlbee-service
+ bitlbee-service-type
+
wicd-service
network-manager-service
connman-service))
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 743b5e3..9a7ea0f 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -25,7 +25,10 @@
#:use-module (guix gexp)
#:use-module (guix records)
#:use-module (srfi srfi-26)
- #:export (lsh-service
+ #:export (lsh-configuration
+ lsh-configuration?
+ lsh-service
+ lsh-service-type
dropbear-configuration
dropbear-configuration?
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 72ef7d4..d86aab5 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <address@hidden>
-;;; Copyright © 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2015, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2016 ng0 <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -27,7 +27,10 @@
#:use-module (guix records)
#:use-module (guix gexp)
#:use-module (ice-9 match)
- #:export (nginx-service))
+ #:export (nginx-configuration
+ nginx-configuration?
+ nginx-service
+ nginx-service-type))
;;; Commentary:
;;;
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 44d12a7..905c88f 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -48,6 +48,8 @@
slim-service-type
slim-service
+ screen-locker
+ screen-locker?
screen-locker-service-type
screen-locker-service))