Merge pull request #35 from monsta/ancient

some cleanup

3 files changed, 2 insertions, 42 deletions

diff --git a/configure.ac b/configure.ac
index e4df717..457dfd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,5 +250,5 @@ AC_MSG_NOTICE([** caja extension path: $ac_with_cajadir])
 AC_MSG_NOTICE([** GTK version: $GTK_API_VERSION])
 
 echo "
-Do note Apache 2.2 and mod_dnssd 0.6 are required to use mate-user-share.
+Do note Apache >= 2.2 and mod_dnssd 0.6 are required to use mate-user-share.
 "
diff --git a/data/Makefile.am b/data/Makefile.am
index 6be5d2a..419b0a1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,7 +10,7 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 autostart_in_files = mate-user-share-obexftp.desktop.in mate-user-share-obexpush.desktop.in mate-user-share-webdav.desktop.in
 
 appdir = $(datadir)/mate-user-share
-app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile file-share-properties.ui
+app_DATA=dav_user_2.2.conf dav_user_2.4.conf dav_groupfile file-share-properties.ui
 
 gsettings_SCHEMAS = org.mate.FileSharing.gschema.xml
 @GSETTINGS_RULES@
diff --git a/data/dav_user_2.0.conf b/data/dav_user_2.0.conf
deleted file mode 100644
index 0be05f3..0000000
--- a/data/dav_user_2.0.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-ServerRoot ${XDG_CONFIG_HOME}/user-share
-PidFile pid
-LockFile lock
-LogLevel crit
-#LogLevel info
-ErrorLog log
-DAVLockDB lock
-
-LimitXMLRequestBody 100000
-
-LoadModule dav_module /etc/httpd/modules/mod_dav.so
-LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so
-LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so
-
-DocumentRoot ${XDG_PUBLICSHARE_DIR}
-<Directory "${XDG_PUBLICSHARE_DIR}">
-  AllowOverride None
-  DAV On
-
-  AuthType Digest
-  AuthName "Please log in as the user guest"
-  AuthDigestDomain /
-  AuthDigestFile ${XDG_CONFIG_HOME}/user-share/passwd
-
-
-  <IfDefine RequirePasswordAlways>
-    Require user guest
-  </IfDefine>
-
-  <IfDefine RequirePasswordOnWrite>
-    <LimitExcept GET OPTIONS PROPFIND>
-      Require user guest
-    </LimitExcept>
-  </IfDefine>
-</Directory>
-
-StartServers 1
-MinSpareServers 1
-MaxSpareServers 1
-MaxClients 3