diff mbox

[2/3] services: Add wpa-supplicant-service.

Message ID 20161109212245.23531-2-sleep_walker@gnu.org
State New
Headers show

Commit Message

Tomáš Čech Nov. 9, 2016, 9:22 p.m. UTC
* gnu/services/networking.scm (wpa-supplicant-service): New procedure.
(wpa-supplicant-service-type): New variable.
(wpa-supplicant-shepherd-service): New procedure.
* doc/guix.texi (Networking Services): Document it.
---
 doc/guix.texi               |  8 ++++++++
 gnu/services/networking.scm | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

Comments

Ludovic Courtès Nov. 9, 2016, 10:32 p.m. UTC | #1
Tomáš Čech <sleep_walker@gnu.org> skribis:

> * gnu/services/networking.scm (wpa-supplicant-service): New procedure.
> (wpa-supplicant-service-type): New variable.
> (wpa-supplicant-shepherd-service): New procedure.
> * doc/guix.texi (Networking Services): Document it.

Could you remove the ‘wpa-supplicant-service’ procedure and simply
expose and document ‘wpa-supplicant-service-type’?  So users would
write:

  (service wpa-supplicant-service-type wpa-supplicant)

instead of:

  (wpa-supplicant-service)

I’m trying to incrementally get us to do that for all services, because
I think it’s a bit clearer (one immediately sees what type of
configuration value is used.)

> +@cindex WPA Supplicant
> +@deffn {Scheme Procedure} wpa-supplicant-service @
> +       [#:wpa-supplicant @var{wpa-supplicant}]
> +Return a service that runs @url{https://w1.fi/wpa_supplicant/,WPA
> +supplicant}, an authentication daemon required to authenticate against
> +encrypted WiFi or ethernet networks.

Could you also mention that wpa_supplicant is started to listen on a
D-Bus interface?

> +         (requirement '(user-processes dbus-system loopback))
> +         (start #~(make-forkexec-constructor
> +                   (list (string-append #$wpa-supplicant
> +                                        "/sbin/wpa_supplicant")
> +                         "-u" "-B")))

I think it would be more reliable to use
“-P/var/run/wpa_supplicant.pid”, and thus

  #:pid-file "/var/run/wpa_supplicant.pid"

OK with changes along these lines, thanks!

Ludo’.
Tomáš Čech Nov. 12, 2016, 6:16 p.m. UTC | #2
I thought I sent reply already but I probably did not thanks to
connection problems ;-)

On Wed, 09 Nov 2016 23:32:52 +0100,
Ludovic Courtès wrote:
> 
> Tomáš Čech <sleep_walker@gnu.org> skribis:
> 
> > * gnu/services/networking.scm (wpa-supplicant-service): New procedure.
> > (wpa-supplicant-service-type): New variable.
> > (wpa-supplicant-shepherd-service): New procedure.
> > * doc/guix.texi (Networking Services): Document it.
> 
> Could you remove the ‘wpa-supplicant-service’ procedure and simply
> expose and document ‘wpa-supplicant-service-type’?  So users would
> write:
> 
>   (service wpa-supplicant-service-type wpa-supplicant)
> 
> instead of:
> 
>   (wpa-supplicant-service)
> 
> I’m trying to incrementally get us to do that for all services, because
> I think it’s a bit clearer (one immediately sees what type of
> configuration value is used.)

I can't say whether it is clearer or not from language or design
perspective, but after the change I had to have a look on your mail to
see how it is done properly so it is less user friendly. Nevertheless
done.

> 
> > +@cindex WPA Supplicant
> > +@deffn {Scheme Procedure} wpa-supplicant-service @
> > +       [#:wpa-supplicant @var{wpa-supplicant}]
> > +Return a service that runs @url{https://w1.fi/wpa_supplicant/,WPA
> > +supplicant}, an authentication daemon required to authenticate against
> > +encrypted WiFi or ethernet networks.
> 
> Could you also mention that wpa_supplicant is started to listen on a
> D-Bus interface?

Done.

> > +         (requirement '(user-processes dbus-system loopback))
> > +         (start #~(make-forkexec-constructor
> > +                   (list (string-append #$wpa-supplicant
> > +                                        "/sbin/wpa_supplicant")
> > +                         "-u" "-B")))
> 
> I think it would be more reliable to use
> “-P/var/run/wpa_supplicant.pid”, and thus
> 
>   #:pid-file "/var/run/wpa_supplicant.pid"
> 
> OK with changes along these lines, thanks!

Good idea!



> OK!

> So does Connman work as expected now?  I guess it was all broken before?

It works better with WiFi after this change but it is still far from perfect.

1] it still can be controlled only by root (it requires D-Bus policy
   to be installed properly and I need to figure out where and how)
2] connman-vpnd is not started - I'll probably make another service for that
3] there needs to be created some configuration mechanism for features
   like enabling/disabling dns proxy (which is IMHO killer feature of
   connman) or ignoring network devices
4] connman is harder to configure without other clients so I'm working
   on connman-json-client (curses) and connman-ui (GTK3)

Best regards,

S_W
Ludovic Courtès Nov. 14, 2016, 9:58 a.m. UTC | #3
Hi!

Tomáš Čech <sleep_walker@gnu.org> skribis:

>> So does Connman work as expected now?  I guess it was all broken before?
>
> It works better with WiFi after this change but it is still far from perfect.
>
> 1] it still can be controlled only by root (it requires D-Bus policy
>    to be installed properly and I need to figure out where and how)
> 2] connman-vpnd is not started - I'll probably make another service for that
> 3] there needs to be created some configuration mechanism for features
>    like enabling/disabling dns proxy (which is IMHO killer feature of
>    connman) or ignoring network devices
> 4] connman is harder to configure without other clients so I'm working
>    on connman-json-client (curses) and connman-ui (GTK3)

OK, it seems that these can be addressed.

I think you forgot to post or commit the new wpa-supplicant-service
patch though, didn’t you?  :-)

Cheers,
Ludo’.
diff mbox

Patch

diff --git a/doc/guix.texi b/doc/guix.texi
index 89a7a58..bdf0bce 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8301,6 +8301,14 @@  several the @command{connmanctl} command to interact with the daemon and
 configure networking."
 @end deffn
 
+@cindex WPA Supplicant
+@deffn {Scheme Procedure} wpa-supplicant-service @
+       [#:wpa-supplicant @var{wpa-supplicant}]
+Return a service that runs @url{https://w1.fi/wpa_supplicant/,WPA
+supplicant}, an authentication daemon required to authenticate against
+encrypted WiFi or ethernet networks.
+@end deffn
+
 @deffn {Scheme Procedure} ntp-service [#:ntp @var{ntp}] @
   [#:servers @var{%ntp-servers}] @
   [#:allow-large-adjustment? #f]
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index df609da..05ee339 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -64,7 +64,8 @@ 
 
             wicd-service
             network-manager-service
-            connman-service))
+            connman-service
+            wpa-supplicant-service))
 
 ;;; Commentary:
 ;;;
@@ -740,4 +741,37 @@  several the @command{connmanctl} command to interact with the daemon and
 configure networking."
   (service connman-service-type connman))
 
+
+
+;;;
+;;; WPA supplicant
+;;;
+
+
+(define (wpa-supplicant-shepherd-service wpa-supplicant)
+  "Return a shepherd service for wpa_supplicant"
+  (list (shepherd-service
+         (documentation "Run WPA supplicant with dbus interface")
+         (provision '(wpa-supplicant))
+         (requirement '(user-processes dbus-system loopback))
+         (start #~(make-forkexec-constructor
+                   (list (string-append #$wpa-supplicant
+                                        "/sbin/wpa_supplicant")
+                         "-u" "-B")))
+         (stop #~(make-kill-destructor)))))
+
+(define wpa-supplicant-service-type
+  (service-type (name 'wpa-supplicant)
+                (extensions
+                 (list (service-extension shepherd-root-service-type
+                                          wpa-supplicant-shepherd-service)
+                       (service-extension dbus-root-service-type list)
+                       (service-extension profile-service-type list)))))
+
+(define* (wpa-supplicant-service #:key (wpa-supplicant wpa-supplicant))
+  "Return a service that runs @url{https://w1.fi/wpa_supplicant/,WPA
+supplicant}, an authentication daemon required to authenticate against
+encrypted WiFi or ethernet networks."
+  (service wpa-supplicant-service-type wpa-supplicant))
+
 ;;; networking.scm ends here