diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2017-07-08 21:04:17 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2017-07-08 21:04:17 +0200 |
| commit | 9c113558ea6dc75850d67d93e7567abb5fbd5dc6 (patch) | |
| tree | d91ebf14c189fa24b7565e90197db2df6a145236 /config | |
| parent | c1b8ab65eb0e7f1cf94f45c9bd56ce05f3a66fb2 (diff) | |
| parent | 8cdd29841d0dbb89e866aad36173bb26182d0c97 (diff) | |
Merge branch 'master' into debian
Diffstat (limited to 'config')
| -rw-r--r-- | config/apache2.conf | 12 | ||||
| -rw-r--r-- | config/lacme.conf | 2 | ||||
| -rw-r--r-- | config/nginx.conf | 18 |
3 files changed, 1 insertions, 31 deletions
diff --git a/config/apache2.conf b/config/apache2.conf deleted file mode 100644 index 20927fa..0000000 --- a/config/apache2.conf +++ /dev/null @@ -1,12 +0,0 @@ -# Use Apache2 to serve ACME requests by passing them over to a -# locally-bound lacme webserver component. -# -# This file needs to be sourced to the server directives (at least the -# non-ssl one) of each virtual host requiring authorization. - -<Location /.well-known/acme-challenge/> - ProxyPass unix:///var/run/lacme.socket|http://127.0.0.1/.well-known/acme-challenge/ - Order allow,deny - Allow from all -</Location> - diff --git a/config/lacme.conf b/config/lacme.conf index 874bb1f..3cc1b34 100644 --- a/config/lacme.conf +++ b/config/lacme.conf @@ -62,7 +62,7 @@ # Comma- or space-separated list of addresses to listen on, for instance # "0.0.0.0:80 [::]:80". # -#listen = /var/run/lacme.socket +#listen = /var/run/lacme-www.socket # Non-existent directory under which an external HTTP daemon is # configured to serve GET requests for challenge files under diff --git a/config/nginx.conf b/config/nginx.conf deleted file mode 100644 index 6753ff9..0000000 --- a/config/nginx.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Use Nginx to serve ACME requests; either directly, or by passing them -# over to a locally-bound lacme webserver component. -# -# This file needs to be sourced to the server directives (at least the -# non-ssl one) of each virtual host requiring authorization. - -location ^~ /.well-known/acme-challenge/ { - # Pass ACME requests to lacme's webserver component - proxy_pass http://unix:/var/run/lacme.socket; - - ## Alternatively, you can let nginx serve the requests by - ## setting 'challenge-directory' to '/var/www/acme-challenge' in - ## lacme's configuration file - # alias /var/www/acme-challenge/; - # default_type application/jose+json; - # disable_symlinks on from=$document_root; - # autoindex off; -} |