diff options
| author | Mario <mario@mariovavti.com> | 2017-10-25 13:29:19 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2017-10-25 13:29:19 +0200 |
| commit | 344aa13c64f0fa7a246f3284bf9cdb267e6101d3 (patch) | |
| tree | 943809c01164dda7b6e4a26bc3d6c7e8c48bd6eb /Zotlabs/Web/Router.php | |
| parent | 61c86212b944efa0d78dcc0364b81bfb8a0d19bc (diff) | |
| parent | 69b22e3f7916b5ba19b5ed03a55ad72bf5995291 (diff) | |
| download | volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.tar.gz volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.tar.bz2 volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.zip | |
Merge branch '2.8RC'
Diffstat (limited to 'Zotlabs/Web/Router.php')
| -rw-r--r-- | Zotlabs/Web/Router.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index 3190369c8..9486130cb 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -119,6 +119,18 @@ class Router { if(! (\App::$module_loaded)) { + // undo the setting of a letsencrypt acme-challenge rewrite rule + // which blocks access to our .well-known routes. + // Also provide a config setting for sites that have a legitimate need + // for a custom .htaccess in the .well-known directory; but they should + // make the file read-only so letsencrypt doesn't modify it + + if(strpos($_SERVER['REQUEST_URI'],'/.well-known/') === 0) { + if(file_exists('.well-known/.htaccess') && get_config('system','fix_apache_acme',true)) { + rename('.well-known/.htaccess','.well-known/.htaccess.old'); + } + } + $x = [ 'module' => $module, 'installed' => \App::$module_loaded, @@ -166,6 +178,7 @@ class Router { */ if(\App::$module_loaded) { + \App::$page['page_title'] = \App::$module; $placeholder = ''; |