renamed .htaccess to .htaccess-dist and ignored .htaccess afterwards (#5428)

* 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 <roland@mxchange.org>
* 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 <roland@mxchange.org>

diff --git a/.gitignore b/.gitignore
index 114bb5dbb9a5054ca0d1c71fcdb054979c15a176..db1c3c1306498253b3694991dbc5a1fd9e393b38 100644 (file)
--- 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
deleted file mode 100644 (file)
index a671cc6..0000000
--- a/.htaccess
+++ /dev/null
@@ -1,40 +0,0 @@
-Options -Indexes
-AddType application/x-java-archive .jar
-AddType audio/ogg .oga
-#AddHandler php53-cgi .php
-
-<FilesMatch "\.(out|log)$">
-  <IfModule authz_host_module>
-    #Apache 2.4
-    Require all denied
-  </IfModule>
-  <IfModule !authz_host_module>
-    #Apache 2.2
-    Deny from all
-  </IfModule>
-</FilesMatch>
-
-<IfModule mod_rewrite.c>
-  RewriteEngine on
-  # Protect repository directory from browsing
-  RewriteRule "(^|/)\.git" - [F]
-
-  # Rewrite current-style URLs of the form 'index.php?pagename=x'.
-  # Also place auth information into REMOTE_USER for sites running
-  # in CGI mode.
-
-  # If you have troubles or use VirtualDocumentRoot
-  # uncomment this and set it to the path where your friendica installation is
-  # i.e.:
-  # Friendica url: http://some.example.com
-  # RewriteBase /
-  # Friendica url: http://some.example.com/friendica
-  # RewriteBase /friendica/
-  #
-  #RewriteBase /
-
-  RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
-
-</IfModule>

diff --git a/.htaccess-dist b/.htaccess-dist
new file mode 100644 (file)
index 0000000..a671cc6
--- /dev/null
+++ b/.htaccess-dist
@@ -0,0 +1,40 @@
+Options -Indexes
+AddType application/x-java-archive .jar
+AddType audio/ogg .oga
+#AddHandler php53-cgi .php
+
+<FilesMatch "\.(out|log)$">
+  <IfModule authz_host_module>
+    #Apache 2.4
+    Require all denied
+  </IfModule>
+  <IfModule !authz_host_module>
+    #Apache 2.2
+    Deny from all
+  </IfModule>
+</FilesMatch>
+
+<IfModule mod_rewrite.c>
+  RewriteEngine on
+  # Protect repository directory from browsing
+  RewriteRule "(^|/)\.git" - [F]
+
+  # Rewrite current-style URLs of the form 'index.php?pagename=x'.
+  # Also place auth information into REMOTE_USER for sites running
+  # in CGI mode.
+
+  # If you have troubles or use VirtualDocumentRoot
+  # uncomment this and set it to the path where your friendica installation is
+  # i.e.:
+  # Friendica url: http://some.example.com
+  # RewriteBase /
+  # Friendica url: http://some.example.com/friendica
+  # RewriteBase /friendica/
+  #
+  #RewriteBase /
+
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+
+</IfModule>

diff --git a/doc/Install.md b/doc/Install.md
index 6eb249a81215d115ee0605209c6c29f1a6980f4e..79747c0837692e02f15e32bbeb6f09db3c3a8022 100644 (file)
--- 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.