summaryrefslogtreecommitdiff
path: root/px
diff options
context:
space:
mode:
Diffstat (limited to 'px')
-rw-r--r--px/packages/device.scm27
-rw-r--r--px/services/bluetooth.scm59
-rw-r--r--px/services/device.scm60
3 files changed, 4 insertions, 142 deletions
diff --git a/px/packages/device.scm b/px/packages/device.scm
index 6452a14..31d0727 100644
--- a/px/packages/device.scm
+++ b/px/packages/device.scm
@@ -380,33 +380,6 @@ configuration file from commandline args and upload results to the server")
"Pulls device backup config from Central Management and runs the backup.")
(license license:expat)))
-(define-public bluetooth-client-manager-service
- (package
- (name "bluetooth-client-manager-service")
- (version "0.1.10")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://source.pantherx.org/" name "_v" version
- ".tgz"))
- (sha256
- (base32 "1rryll9pic2k5gqdhyrxiff20dgs4xs8j2213vy5l1p4ahinlwrf"))))
- (build-system cmake-build-system)
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs `(("bluez-qt" ,bluez-qt)
- ("capnproto" ,capnproto-0.9)
- ("openssl" ,openssl)
- ("qtbase" ,qtbase-5)
- ("util-linux" ,util-linux "lib")
- ("yaml-cpp" ,yaml-cpp)))
- (arguments
- `(#:tests? #f))
- (home-page "https://pantherx.org")
- (synopsis "Bluetooth Client Manager Service")
- (description
- "Background service for Bluetooth device discovery, data retrieval and submission")
- (license license:expat)))
-
(define-public sysinfo-daemon
(package
(name "sysinfo-daemon")
diff --git a/px/services/bluetooth.scm b/px/services/bluetooth.scm
index ce72f31..2c2dbe6 100644
--- a/px/services/bluetooth.scm
+++ b/px/services/bluetooth.scm
@@ -20,9 +20,7 @@
#:use-module (ice-9 pretty-print)
#:export (btuart-configuration
- btuart-service-type
- bluetooth-client-manager-configuration
- bluetooth-client-manager-service-type))
+ btuart-service-type))
;;
;; btuart-service-type
@@ -74,57 +72,4 @@
shepherd-root-service-type
btuart-shepherd-service)))
(default-value (btuart-configuration))
- (description "Attach serial lines as Bluetooth HCI interfaces")))
-
-;;
-;; bluetooth-client-manager-service
-;;
-
-(define-record-type* <bluetooth-client-manager-configuration>
- bluetooth-client-manager-configuration
- make-bluetooth-client-manager-configuration
- bluetooth-client-manager-configuration?
- (package
- bluetooth-client-manager-configuration-package
- (default bluetooth-client-manager-service))
- (debug? bluetooth-client-manager-configuration-debug?
- (default #f))
- (skip-approval? bluetooth-client-manager-configuration-skip-approval?
- (default #f)))
-
-(define bluetooth-client-manager-shepherd-service
- (match-lambda
- (($ <bluetooth-client-manager-configuration> package debug? skip-approval?)
- (list (shepherd-service (provision '(bluetooth-client-manager-service))
- (documentation
- "Run px-device-identity-service as a daemon")
- (requirement '(networking user-processes
- px-device-identity))
- (start #~(make-forkexec-constructor (list (string-append #$package
- "/bin/bluetooth-client-manager-service")
- #$@(if
- debug?
- '("--verbose")
- '())
- #$@(if
- skip-approval?
- '("--skip-approval")
- '()))
- #:log-file
- "/var/log/bluetooth-client-manager-service.log"
- #:environment-variables (cons*
- "HOME=/root"
- "XDG_DATA_HOME=/root/.local/share"
- "XDG_CONFIG_HOME=/root/.config"
- "SSL_CERT_DIR=/run/current-system/profile/etc/ssl/certs"
- "SSL_CERT_FILE=/run/current-system/profile/etc/ssl/certs/ca-certificates.crt"
- (default-environment-variables))))
- (stop #~(make-kill-destructor)))))))
-
-(define bluetooth-client-manager-service-type
- (service-type (name 'bluetooth-client-manager-service)
- (description "PantherX Bluetooth Client Manager service")
- (extensions (list (service-extension
- shepherd-root-service-type
- bluetooth-client-manager-shepherd-service)))
- (default-value (bluetooth-client-manager-configuration))))
+ (description "Attach serial lines as Bluetooth HCI interfaces"))) \ No newline at end of file
diff --git a/px/services/device.scm b/px/services/device.scm
index d783334..64036fc 100644
--- a/px/services/device.scm
+++ b/px/services/device.scm
@@ -38,10 +38,7 @@
px-file-upload-service-type
btuart-configuration
- btuart-service-type
-
- bluetooth-client-manager-configuration
- bluetooth-client-manager-service-type))
+ btuart-service-type))
;;
;; Device Identity API SERVICE
@@ -316,57 +313,4 @@ delete_on_success = ~a"
shepherd-root-service-type
btuart-shepherd-service)))
(default-value (btuart-configuration))
- (description "Attach serial lines as Bluetooth HCI interfaces")))
-
-;;
-;; bluetooth-client-manager-service
-;;
-
-(define-record-type* <bluetooth-client-manager-configuration>
- bluetooth-client-manager-configuration
- make-bluetooth-client-manager-configuration
- bluetooth-client-manager-configuration?
- (package
- bluetooth-client-manager-configuration-package
- (default bluetooth-client-manager-service))
- (debug? bluetooth-client-manager-configuration-debug?
- (default #f))
- (skip-approval? bluetooth-client-manager-configuration-skip-approval?
- (default #f)))
-
-(define bluetooth-client-manager-shepherd-service
- (match-lambda
- (($ <bluetooth-client-manager-configuration> package debug? skip-approval?)
- (list (shepherd-service (provision '(bluetooth-client-manager-service))
- (documentation
- "Run px-device-identity-service as a daemon")
- (requirement '(networking user-processes
- px-device-identity))
- (start #~(make-forkexec-constructor (list (string-append #$package
- "/bin/bluetooth-client-manager-service")
- #$@(if
- debug?
- '("--verbose")
- '())
- #$@(if
- skip-approval?
- '("--skip-approval")
- '()))
- #:log-file
- "/var/log/bluetooth-client-manager-service.log"
- #:environment-variables (cons*
- "HOME=/root"
- "XDG_DATA_HOME=/root/.local/share"
- "XDG_CONFIG_HOME=/root/.config"
- "SSL_CERT_DIR=/run/current-system/profile/etc/ssl/certs"
- "SSL_CERT_FILE=/run/current-system/profile/etc/ssl/certs/ca-certificates.crt"
- (default-environment-variables))))
- (stop #~(make-kill-destructor)))))))
-
-(define bluetooth-client-manager-service-type
- (service-type (name 'bluetooth-client-manager-service)
- (description "PantherX Bluetooth Client Manager service")
- (extensions (list (service-extension
- shepherd-root-service-type
- bluetooth-client-manager-shepherd-service)))
- (default-value (bluetooth-client-manager-configuration))))
+ (description "Attach serial lines as Bluetooth HCI interfaces"))) \ No newline at end of file