diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-04-08 10:20:33 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-04-08 10:24:02 +0200 |
| commit | ee0ad7803c82383ac1bced073d8670bc407797e7 (patch) | |
| tree | 8fe5f367737013bb6262a32182971a123b72af1c /gnu/installer | |
| parent | 07a53bd512530d8f87e076263227216c467727bb (diff) | |
installer: Add proxy support.
* gnu/installer/proxy.scm: New file.
* gnu/local.mk (INSTALLER_MODULES): Add it.
* po/guix/POTFILES.in: Add it.
* gnu/installer/newt/parameters.scm (run-proxy-page): New procedure,
(run-parameters-page): add the previous procedure to the parameters menu.
Diffstat (limited to 'gnu/installer')
| -rw-r--r-- | gnu/installer/newt/parameters.scm | 14 | ||||
| -rw-r--r-- | gnu/installer/proxy.scm | 45 |
2 files changed, 58 insertions, 1 deletions
diff --git a/gnu/installer/newt/parameters.scm b/gnu/installer/newt/parameters.scm index 4a34e941552..95112b5780e 100644 --- a/gnu/installer/newt/parameters.scm +++ b/gnu/installer/newt/parameters.scm | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. | 17 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. |
| 18 | 18 | ||
| 19 | (define-module (gnu installer newt parameters) | 19 | (define-module (gnu installer newt parameters) |
| 20 | #:use-module (gnu installer proxy) | ||
| 20 | #:use-module (gnu installer steps) | 21 | #:use-module (gnu installer steps) |
| 21 | #:use-module (gnu installer newt page) | 22 | #:use-module (gnu installer newt page) |
| 22 | #:use-module (guix i18n) | 23 | #:use-module (guix i18n) |
| @@ -24,11 +25,22 @@ | |||
| 24 | #:use-module (newt) | 25 | #:use-module (newt) |
| 25 | #:export (run-parameters-page)) | 26 | #:export (run-parameters-page)) |
| 26 | 27 | ||
| 28 | (define (run-proxy-page) | ||
| 29 | (define proxy | ||
| 30 | (run-input-page (G_ "Please enter the HTTP proxy URL. If you enter an \ | ||
| 31 | empty string, proxy usage will be disabled.") | ||
| 32 | (G_ "HTTP proxy configuration") | ||
| 33 | #:allow-empty-input? #t)) | ||
| 34 | (if (string=? proxy "") | ||
| 35 | (clear-http-proxy) | ||
| 36 | (set-http-proxy proxy))) | ||
| 37 | |||
| 27 | (define (run-parameters-page keyboard-layout-selection) | 38 | (define (run-parameters-page keyboard-layout-selection) |
| 28 | "Run a parameters page allowing to change the keyboard layout" | 39 | "Run a parameters page allowing to change the keyboard layout" |
| 29 | (let* ((items | 40 | (let* ((items |
| 30 | (list | 41 | (list |
| 31 | (cons (G_ "Change keyboard layout") keyboard-layout-selection))) | 42 | (cons (G_ "Change keyboard layout") keyboard-layout-selection) |
| 43 | (cons (G_ "Configure HTTP proxy") run-proxy-page))) | ||
| 32 | (result | 44 | (result |
| 33 | (run-listbox-selection-page | 45 | (run-listbox-selection-page |
| 34 | #:info-text (G_ "Please choose one of the following parameters or \ | 46 | #:info-text (G_ "Please choose one of the following parameters or \ |
diff --git a/gnu/installer/proxy.scm b/gnu/installer/proxy.scm new file mode 100644 index 00000000000..befaf3ab0ae --- /dev/null +++ b/gnu/installer/proxy.scm | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | ||
| 2 | ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> | ||
| 3 | ;;; | ||
| 4 | ;;; This file is part of GNU Guix. | ||
| 5 | ;;; | ||
| 6 | ;;; GNU Guix is free software; you can redistribute it and/or modify it | ||
| 7 | ;;; under the terms of the GNU General Public License as published by | ||
| 8 | ;;; the Free Software Foundation; either version 3 of the License, or (at | ||
| 9 | ;;; your option) any later version. | ||
| 10 | ;;; | ||
| 11 | ;;; GNU Guix is distributed in the hope that it will be useful, but | ||
| 12 | ;;; WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | ;;; GNU General Public License for more details. | ||
| 15 | ;;; | ||
| 16 | ;;; You should have received a copy of the GNU General Public License | ||
| 17 | ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. | ||
| 18 | |||
| 19 | (define-module (gnu installer proxy) | ||
| 20 | #:use-module (gnu services herd) | ||
| 21 | #:export (set-http-proxy | ||
| 22 | clear-http-proxy)) | ||
| 23 | |||
| 24 | (define-syntax-rule (with-silent-shepherd exp ...) | ||
| 25 | (parameterize ((shepherd-message-port | ||
| 26 | (%make-void-port "w"))) | ||
| 27 | exp ...)) | ||
| 28 | |||
| 29 | (define (set-http-proxy proxy) | ||
| 30 | (with-silent-shepherd | ||
| 31 | (with-shepherd-action 'guix-daemon | ||
| 32 | ('set-http-proxy proxy) | ||
| 33 | result | ||
| 34 | result))) | ||
| 35 | |||
| 36 | (define (clear-http-proxy) | ||
| 37 | (with-silent-shepherd | ||
| 38 | (with-shepherd-action 'guix-daemon | ||
| 39 | ('set-http-proxy) | ||
| 40 | result | ||
| 41 | result))) | ||
| 42 | |||
| 43 | ;; Local Variables: | ||
| 44 | ;; eval: (put 'with-silent-shepherd 'scheme-indent-function 0) | ||
| 45 | ;; End: | ||
