summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-05-07 11:54:42 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-05-07 11:54:42 +0200
commit9bdd00c0f22deea144eebe4773ef70063ea45575 (patch)
treea294e7a085cea8566bb7b107302498e81bab8a22
parent46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3 (diff)
downloadnextcloud-server-9bdd00c0f22deea144eebe4773ef70063ea45575.tar.gz
nextcloud-server-9bdd00c0f22deea144eebe4773ef70063ea45575.zip
update htaccess file and remove remote folder
-rw-r--r--.htaccess12
-rw-r--r--remote/.gitignore2
2 files changed, 6 insertions, 8 deletions
diff --git a/.htaccess b/.htaccess
index 73e1af62134..fd1f6abb969 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,9 +1,9 @@
ErrorDocument 403 /core/templates/403.php
ErrorDocument 404 /core/templates/404.php
-Redirect 301 /apps/calendar/caldav.php /remote/caldav.php
-Redirect 301 /apps/contacts/carddav.php /remote/carddav.php
-Redirect 301 /apps/files/webdav.php /remote/webdav.php
-Redirect 301 /files/webdav.php /remote/webdav.php
+Redirect 301 /apps/calendar/caldav.php /remote.php/caldav/
+Redirect 301 /apps/contacts/carddav.php /remote.php/carddav/
+Redirect 301 /apps/files/webdav.php /remote.php/webdav/
+Redirect 301 /files/webdav.php /remote.php/webdav/
<IfModule mod_php5.c>
php_value upload_max_filesize 512M
php_value post_max_size 512M
@@ -15,8 +15,8 @@ php_value memory_limit 512M
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-RewriteRule ^.well-known/carddav /remote/carddav.php [R]
-RewriteRule ^.well-known/caldav /remote/caldav.php [R]
+RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]
+RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]
RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
RewriteRule ^remote/(.*) remote.php [QSA,L]
diff --git a/remote/.gitignore b/remote/.gitignore
deleted file mode 100644
index c96a04f008e..00000000000
--- a/remote/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore \ No newline at end of file