From 6da47936c63039792a0cbf9021e69f2cd1ad4731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sat, 21 Jul 2018 02:27:37 +0200 Subject: [PATCH] renamed .htaccess to .htaccess-dist and ignored .htaccess afterwards (#5428) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * renamed .htaccess to .htaccess-dist and ignored .htaccess afterwards. This allows local changes to it without having a dirty checkout directory. Signed-off-by: Roland Häder * Some fixes: - removed non-neutral words - added examples for Linux/Windows * Better documentation and added note about **not** renaming the file. Signed-off-by: Roland Häder --- .gitignore | 5 ++++- .htaccess => .htaccess-dist | 0 doc/Install.md | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) rename .htaccess => .htaccess-dist (100%) diff --git a/.gitignore b/.gitignore index 114bb5dbb9..db1c3c1306 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,7 @@ venv/ #ignore addons directory /addons -/addon \ No newline at end of file +/addon + +#ignore .htaccess +.htaccess diff --git a/.htaccess b/.htaccess-dist similarity index 100% rename from .htaccess rename to .htaccess-dist diff --git a/doc/Install.md b/doc/Install.md index 6eb249a812..79747c0837 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -135,6 +135,16 @@ For more information during the installation, you can use this command line opti bin/console autoinstall -v +### Prepare .htaccess file + +Copy .htaccess-dist to .htaccess (be careful under Windows) to have working mod-rewrite again. If you have installed Friendica into a sub directory, like /friendica/ set this path in RewriteBase accordingly. + +Example: + + cp .htacces-dist .htaccess + +*Note*: Do **not** rename the .htaccess-dist file as it is tracked by GIT and renaming will cause a dirty working directory. + ### Set up the worker Set up a cron job or scheduled task to run the worker once every 5-10 minutes in order to perform background processing.