diff --git a/doc/sphinx/administration/configuration/osh-http-proxy_conf.rst b/doc/sphinx/administration/configuration/osh-http-proxy_conf.rst index 0e70c47..ffb2718 100644 --- a/doc/sphinx/administration/configuration/osh-http-proxy_conf.rst +++ b/doc/sphinx/administration/configuration/osh-http-proxy_conf.rst @@ -91,7 +91,7 @@ ciphers :Example: ``"ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256"`` -The ordered list the TLS server ciphers, in ``openssl`` classic format. Use ``openssl ciphers`' to see what your system supports, +The ordered list the TLS server ciphers, in ``openssl`` classic format. Use ``openssl ciphers`` to see what your system supports, an empty list leaves the choice to your openssl libraries default values (system-dependent) .. _insecure: diff --git a/doc/sphinx/build-bastion-conf-help.pl b/doc/sphinx/build-bastion-conf-help.pl index c3dac2b..9db5cee 100644 --- a/doc/sphinx/build-bastion-conf-help.pl +++ b/doc/sphinx/build-bastion-conf-help.pl @@ -30,7 +30,6 @@ sub dumpdoc { my $state = ''; while () { - print STDERR $_; next if /^\s*$/; if (m{^# ([a-zA-Z0-9_]+) \((.+)\)}) { $h{param} = $1; diff --git a/doc/sphinx/using/basics.rst b/doc/sphinx/using/basics.rst deleted file mode 100644 index bf8d154..0000000 --- a/doc/sphinx/using/basics.rst +++ /dev/null @@ -1,15 +0,0 @@ -========== -The basics -========== - -This section explains the basics you need to know to work with the bastion. It's advised to go through all the subsections. - -We make the assumption here that you already have a bastion account: - -- either you're one of the admins who just :doc:`installed<../../installation/basic>` it, or -- one of the admins created an account for you, using :doc:`/plugins/restricted/accountCreate` - -.. toctree:: - - first_steps - access_management diff --git a/etc/bastion/osh-http-proxy.conf.dist b/etc/bastion/osh-http-proxy.conf.dist index 4196b8e..ad47bb1 100644 --- a/etc/bastion/osh-http-proxy.conf.dist +++ b/etc/bastion/osh-http-proxy.conf.dist @@ -31,7 +31,7 @@ "ssl_key": "/etc/ssl/private/ssl-cert-snakeoil.key", # # ciphers (string) -# DESC: The ordered list the TLS server ciphers, in ``openssl`` classic format. Use ``openssl ciphers`' to see what your system supports, +# DESC: The ordered list the TLS server ciphers, in ``openssl`` classic format. Use ``openssl ciphers`` to see what your system supports, # an empty list leaves the choice to your openssl libraries default values (system-dependent) # EXAMPLE: "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256" # DEFAULT: ""