Merge pull request #5057 from M-arcus/patch-2

[BUGFIX] .htaccess: Add file

diff --git a/.gitignore b/.gitignore
index 12dd3b49ea772ae0129944dc48c8811ed0da6326..9de700d148d8960ee1b9a52f5f00ba4dc8b31300 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,3 @@ vendor/*
 
 #ignore addons/ directory
 addons/
-
-#Ignore .htaccess as it may contain local changes
-.htaccess

diff --git a/.htaccess b/.htaccess
new file mode 100644 (file)
index 0000000..a671cc6
--- /dev/null
+++ b/.htaccess
@@ -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/.htaccess-dist b/.htaccess-dist
deleted file mode 100644 (file)
index a671cc6..0000000
--- a/.htaccess-dist
+++ /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>