summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/appendix/migrate-from-vyatta.rst2
-rw-r--r--docs/services/sstp-server.rst1
-rw-r--r--docs/system/index.rst5
-rw-r--r--docs/system/login-users.rst (renamed from docs/system/system-users.rst)4
-rw-r--r--docs/system/proxy.rst28
5 files changed, 37 insertions, 3 deletions
diff --git a/docs/appendix/migrate-from-vyatta.rst b/docs/appendix/migrate-from-vyatta.rst
index b7747605..39b5939b 100644
--- a/docs/appendix/migrate-from-vyatta.rst
+++ b/docs/appendix/migrate-from-vyatta.rst
@@ -27,7 +27,7 @@ public key.
.. code-block:: sh
- vyatta@vyatta:~$ '''wget http://vyos.net/so3group_maintainers.key'''
+ vyatta@vyatta:~$ '''wget http://wiki.vyos.net/so3group_maintainers.key'''
Connecting to vyos.net (x.x.x.x:80)
so3group_maintainers 100% |******************************| 3125 --:--:-- ETA
vyatta@vyatta:~$ '''sudo apt-key add so3group_maintainers.key'''
diff --git a/docs/services/sstp-server.rst b/docs/services/sstp-server.rst
index 6ddbce38..bed2e1a6 100644
--- a/docs/services/sstp-server.rst
+++ b/docs/services/sstp-server.rst
@@ -62,6 +62,7 @@ Use <tab> to setup the ``set sstp-settings ssl-certs ...``, it automatically loo
.. code-block:: sh
+ edit service sstp-server
set authentication local-users username foo password 'bar'
set authentication mode 'local'
set network-settings client-ip-settings gateway-address '10.100.100.1'
diff --git a/docs/system/index.rst b/docs/system/index.rst
index f52ea3d8..4edfce48 100644
--- a/docs/system/index.rst
+++ b/docs/system/index.rst
@@ -11,13 +11,14 @@ should be ready for further configuration which is described in this chapter.
:maxdepth: 2
:hidden:
+ config-management
eventhandler
flowaccounting
host-information
+ login-users
ntp
+ proxy
serialconsole
- system-users
syslog
task-scheduler
- config-management
time-zone
diff --git a/docs/system/system-users.rst b/docs/system/login-users.rst
index a2e62024..f330183f 100644
--- a/docs/system/system-users.rst
+++ b/docs/system/login-users.rst
@@ -96,6 +96,10 @@ This configuration results in:
secret s3cr3t0816
}
+.. note:: If you wan't to have admin users to authenticate via RADIUS it is
+ essential to sent the ``Cisco-AV-Pair shell:priv-lvl=15`` attribute. Without
+ the attribute you will only get regular, non privilegued, system users.
+
Source Address
**************
diff --git a/docs/system/proxy.rst b/docs/system/proxy.rst
new file mode 100644
index 00000000..4ff5717b
--- /dev/null
+++ b/docs/system/proxy.rst
@@ -0,0 +1,28 @@
+.. _proxy:
+
+System Proxy
+============
+
+Some IT environments require the use of a proxy to connect to the Internet.
+The option allowes to set a HTTP proxy and if necessary, supports `basic auth`_.
+
+The code example below sets a proxy for all HTTP, HTTPS and FTP (anonymous ftp) connections, initiated by vyos.
+
+.. code-block:: sh
+
+ set system proxy url http://10.100.100.1
+ set system proxy port 8080
+
+That enables the update of a system image if the vyos system operates behind a proxy.
+
+.. code-block:: sh
+
+ vyos@vyos:~$ add system image https://downloads.vyos.io/rolling/current/amd64/vyos-rolling-latest.iso
+ Trying to fetch ISO file from https://downloads.vyos.io/rolling/current/amd64/vyos-rolling-latest.iso
+ % Total % Received % Xferd Average Speed Time Time Time Current
+ Dload Upload Total Spent Left Speed
+ 1 413M 1 4479k 0 0 995k 0 0:07:04 0:00:04 0:07:00 995k
+
+
+
+.. _`basic auth`: https://tools.ietf.org/html/rfc7617