branch master updated: Revert adding a jami service, myself as admin.

[Maxim Cournoyer]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 9782bc1  Revert adding a jami service, myself as admin.
9782bc1 is described below

commit 9782bc16ef4384171c7b7381ad27a4b9ba60ca61
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 29 23:36:01 2021 -0400

    Revert adding a jami service, myself as admin.
    
    This reverts the two last commits, c7d51c6 and 063ddc0, pushed by
    mistake.  Apologies!
---
 hydra/milano-guix-1.scm | 50 ++-----------------------------------------------
 1 file changed, 2 insertions(+), 48 deletions(-)

diff --git a/hydra/milano-guix-1.scm b/hydra/milano-guix-1.scm
index 4fd8c30..b3f23d0 100644
--- a/hydra/milano-guix-1.scm
+++ b/hydra/milano-guix-1.scm
@@ -10,7 +10,7 @@
 (use-modules (gnu)
              (guix gexp))
 (use-service-modules databases getmail guix networking mcron ssh
-                     telephony virtualization web monitoring)
+                     virtualization web monitoring)
 (use-package-modules certs screen tmux ssh linux)
 
 ;; The following definition are **almost** copied from dover.scm: a
@@ -33,7 +33,6 @@
         (sysadmin "cbaines" "Christopher Baines")
         (sysadmin "degrees380" "Giovanni Biscuolo")
         (sysadmin "atrent" "Andrea Trentini")
-        (sysadmin "maxim" "Maxim Cournoyer")
         (user-account
          (name "hydra")
          (comment "Hydra User")
@@ -118,8 +117,7 @@
                          ("ludo" ,(local-file "keys/ssh/ludo.pub"))
                          ("andreas" ,(local-file "keys/ssh/andreas.pub"))
                          ("cbaines" ,(local-file "keys/ssh/cbaines.pub"))
-                         ("rekado" ,(local-file "keys/ssh/rekado.pub"))
-                         ("maxim" ,(local-file "keys/ssh/maxim.pub"))))))
+                         ("rekado" ,(local-file "keys/ssh/rekado.pub"))))))
 
             (service ntp-service-type)
 
@@ -149,50 +147,6 @@
                      (non-derivation-substitute-urls
                       (list "https://bordeaux.guix.gnu.org";)))))
 
-           (service jami-service-type
-                    (jami-configuration
-                     (accounts
-                      ;; Note: The following Jami accounts have
-                      ;; registered usernames that match their file
-                      ;; names (e.g. 'rdv-guix-maintainers' and
-                      ;; 'rdv-guix-sysadmin', for convenience.  If
-                      ;; they are lost, new usernames will have to be
-                      ;; created; so it's wise to keep them backed up.
-                      (list (jami-account
-                             (archive "/etc/jami/rdv-guix-maintainers.gz")
-                             (rendezvous-point? #t)
-                             (allowed-contacts
-                              '("d873d0ebe6c3b57f77a362fe867dd03a4f9efb76" 
;apteryx
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;civodul
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;mbakke
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;mothacehe
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;nckx
-                                )))
-                            (jami-account
-                             (archive "/etc/jami/rdv-guix-sysadmin.gz")
-                             (rendezvous-point? #t)
-                             (allowed-contacts
-                              '(;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;andreas
-                                "d873d0ebe6c3b57f77a362fe867dd03a4f9efb76" 
;apteryx
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;bisculo
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;boskovits
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;cbaines
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;civodul
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;dannym
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;efraim
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;janneke
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;jlicht
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;lfam
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;marusich
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;mbakke
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;mhw
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;mothacehe
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;nckx
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;pelzfloria
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;rekado
-                                ;; "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" 
;roptat
-                                )))))))
-
            (modify-services %base-services
              (guix-service-type
               config => (guix-configuration