diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-05-07 16:18:35 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-05-07 16:18:35 +0000 |
commit | 4eedfa7ea6a0d7ef5bef6122d2546eb2ce2411b9 (patch) | |
tree | 42f136eed892e375a715c16a530767b33f660fbc | |
parent | fb32eb1e6dae38d8281b9edb63b4663f942a57d9 (diff) | |
parent | 083d2c7412595d014e5cfe3c39f690b32a531a5d (diff) | |
download | lorry-controller-4eedfa7ea6a0d7ef5bef6122d2546eb2ce2411b9.tar.gz |
Merge branch 'baserock/liw/lorry-controller-proxy-conf-doc'
Reviewed-by: Daniel Silverstone
Reviewed-by: Adam Coldrick
-rw-r--r-- | README | 21 |
1 files changed, 21 insertions, 0 deletions
@@ -94,3 +94,24 @@ local `.lorry` files. The syntax of `.lorry` files is specified by the Lorry program; see its documentation for details. + + +HTTP proxy configuration +------------------------ + +Lorry Controller will look for a file called `proxy.conf` in the same +directory as the `lorry-controller.conf` configuration file. +It is in JSON format, with the following key/value pairs: + +* `hostname` -- the hostname of the HTTP proxy +* `username` -- username for authenticating to the proxy +* `password` -- a **cleartext** password for authenticating to the + proxy +* `port` -- port number for connecting to the proxy + +Lorry Controller will use this information for both HTTP and HTTPS +proxying. + +Do note that the **password is stored in cleartext** and that access +to the configuration file (and the git repository where it is stored) +must be controlled appropriately. |