diff --git a/docs/admin/01_config.rst b/docs/admin/01_config.rst index 7b7b413a4d641b614bd463b5a6bfd27c715e4a0e..a8e593b4afb1bf98b980c1bb548a75fb513b6bbf 100644 --- a/docs/admin/01_config.rst +++ b/docs/admin/01_config.rst @@ -29,12 +29,15 @@ A configuration file might look like this:: secret_key = "VerySecretKeyForSessionSecurity" + [http] allowed_hosts = [ "aleksis.myschool.example.com", "localhost" ] + [database] name = "aleksis" user = "aleksis" password = "SuperSecretPassword" + [caching] memcached = { enabled = true, address = "127.0.0.1" } The `secret_key` setting above defines a single value. The following `http` diff --git a/docs/admin/02_ldap.rst b/docs/admin/02_ldap.rst index 7723ad8c2d14b3a02c78250dfac3c1a89ae94c4a..5ef33259b580fc68909c58f4b4a8b1fd507fcd4b 100644 --- a/docs/admin/02_ldap.rst +++ b/docs/admin/02_ldap.rst @@ -25,8 +25,10 @@ configuration file. For example, add something like the following to your configuration (normally in `/etc/aleksis`; you can either append to an existing file or add a new one):: + [ldap] uri = "ldaps://ldap.myschool.edu" bind = { dn = "cn=reader,dc=myschool,dc=edu", password = "secret" } + [ldap.users] search = { base = "ou=people,dc=myschool,dc=edu", filter = "(uid=%(user)s)" } map = { first_name = "givenName", last_name = "sn", email = "mail" } diff --git a/docs/admin/03_psql.rst b/docs/admin/03_psql.rst index 657a482df77dfeb5fb08a42f3e3e6aba1e7282f7..6d5ab57ae3b157ca906f3cfb7df1d3897efdfbd7 100644 --- a/docs/admin/03_psql.rst +++ b/docs/admin/03_psql.rst @@ -32,6 +32,7 @@ Configure AlekSIS to use PostgreSQL Fill in the configuration under `/etc/aleksis/aleksis.toml` (or a file with any other name in this directory):: + [database] host = "localhost" name = "aleksis" username = "aleksis"