Merge pull request #14 from NiceandGently/master

Add support for Apache HTTPD 2.4

6 files changed, 109 insertions, 5 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 953fa83..665cf93 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,10 +7,10 @@ desktop_in_files = mate-user-share-properties.desktop.in
 
 autostartdir = $(sysconfdir)/xdg/autostart/
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-autostart_in_files = mate-user-share.desktop.in
+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_groupfile file-share-properties.ui
+app_DATA=dav_user_2.0.conf 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@
@@ -21,7 +21,9 @@ convert_DATA = mate-user-share.convert
 EXTRA_DIST = $(gsettings_SCHEMAS) \
 	$(app_DATA)		\
 	$(desktop_in_files)	\
-	mate-user-share.desktop.in.in \
+	mate-user-share-obexftp.desktop.in.in \
+	mate-user-share-obexpush.desktop.in.in \
+	mate-user-share-webdav.desktop.in.in \
 	file-share-properties.ui
 
 CLEANFILES = $(desktop_DATA) $(autostart_DATA)
diff --git a/data/dav_user_2.2.conf b/data/dav_user_2.2.conf
index f38d9ee..785aeab 100644
--- a/data/dav_user_2.2.conf
+++ b/data/dav_user_2.2.conf
@@ -31,7 +31,7 @@ DNSSDAutoRegisterUserDir Off
 
     AuthDigestProvider file
     AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
-    AuthGroupFile /usr/share/gnome-user-share/dav_groupfile
+    AuthGroupFile /usr/share/mate-user-share/dav_groupfile
 
     <IfDefine RequirePasswordAlways>
       Require user guest
diff --git a/data/dav_user_2.4.conf b/data/dav_user_2.4.conf
new file mode 100644
index 0000000..c7a88a1
--- /dev/null
+++ b/data/dav_user_2.4.conf
@@ -0,0 +1,78 @@
+ServerRoot ${XDG_CONFIG_HOME}/user-share
+DefaultRuntimeDir ${XDG_CONFIG_HOME}/user-share
+PidFile pid
+LogLevel crit
+#LogLevel info
+ErrorLog log
+DAVLockDB lock
+
+LimitXMLRequestBody 100000
+
+LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
+LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
+LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
+LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
+LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
+LoadModule authn_file_module ${HTTP_MODULES_PATH}/mod_authn_file.so
+LoadModule auth_digest_module ${HTTP_MODULES_PATH}/mod_auth_digest.so
+LoadModule authz_core_module ${HTTP_MODULES_PATH}/mod_authz_core.so
+LoadModule authz_user_module ${HTTP_MODULES_PATH}/mod_authz_user.so
+LoadModule authz_groupfile_module ${HTTP_MODULES_PATH}/mod_authz_groupfile.so
+LoadModule dnssd_module ${HTTP_MODULES_PATH}/mod_dnssd.so
+
+DNSSDEnable on
+DNSSDAutoRegisterVHosts Off
+DNSSDAutoRegisterUserDir Off
+
+<VirtualHost *>
+  DocumentRoot ${XDG_PUBLICSHARE_DIR}
+
+  <Location />
+    DAV On
+
+    AuthType Digest
+    AuthName "${GUS_LOGIN_LABEL}"
+    AuthDigestDomain /
+
+    AuthDigestProvider file
+    AuthUserFile ${XDG_CONFIG_HOME}/user-share/passwd
+    AuthGroupFile /usr/share/mate-user-share/dav_groupfile
+
+    <IfDefine RequirePasswordAlways>
+      Require user guest
+      Require group guest
+    </IfDefine>
+
+    <IfDefine RequirePasswordOnWrite>
+      <LimitExcept GET OPTIONS PROPFIND>
+        Require user guest
+        Require group guest
+      </LimitExcept>
+    </IfDefine>
+
+    DNSSDServiceName "${GUS_SHARE_NAME}"
+    DNSSDServiceTypes _webdav._tcp
+    DNSSDServiceTxtRecord u=guest
+  </Location>
+</VirtualHost>
+
+StartServers 1
+MaxClients 3
+
+<IfModule mpm_prefork_module>
+  MinSpareServers 1
+  MaxSpareServers 1
+</IfModule>
+
+<IfModule mpm_worker_module>
+  MinSpareThreads 1
+  MaxSpareThreads 1
+  ThreadsPerChild 3
+</IfModule>
+
+<IfModule mpm_event_module>
+  MinSpareThreads 1
+  MaxSpareThreads 1
+  ThreadsPerChild 3
+</IfModule>
+
diff --git a/data/mate-user-share-obexftp.desktop.in.in b/data/mate-user-share-obexftp.desktop.in.in
new file mode 100644
index 0000000..d9be7e4
--- /dev/null
+++ b/data/mate-user-share-obexftp.desktop.in.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+_Name=Personal File Sharing obexftp
+_Comment=Launch Personal File Sharing if enabled
+_Keywords=share;files;bluetooth;obex;http;network;copy;send;
+AutostartCondition=GSettings org.mate.FileSharing bluetooth-enabled
+Icon=folder-remote
+Exec=@installdir@/mate-user-share
+Terminal=false
+Type=Application
+Categories=
+OnlyShowIn=MATE;
diff --git a/data/mate-user-share-obexpush.desktop.in.in b/data/mate-user-share-obexpush.desktop.in.in
new file mode 100644
index 0000000..19625e6
--- /dev/null
+++ b/data/mate-user-share-obexpush.desktop.in.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+_Name=Personal File Sharing obexpush
+_Comment=Launch Personal File Sharing if enabled
+_Keywords=share;files;bluetooth;obex;http;network;copy;send;
+AutostartCondition=GSettings org.mate.FileSharing bluetooth-obexpush-enabled
+Icon=folder-remote
+Exec=@installdir@/mate-user-share
+Terminal=false
+Type=Application
+Categories=
+OnlyShowIn=MATE;
diff --git a/data/mate-user-share.desktop.in.in b/data/mate-user-share-webdav.desktop.in.in
index 39fe98c..112140d 100644
--- a/data/mate-user-share.desktop.in.in
+++ b/data/mate-user-share-webdav.desktop.in.in
@@ -1,6 +1,8 @@
 [Desktop Entry]
-_Name=Personal File Sharing
+_Name=Personal File Sharing webdav
 _Comment=Launch Personal File Sharing if enabled
+_Keywords=share;files;bluetooth;obex;http;network;copy;send;
+AutostartCondition=GSettings org.mate.FileSharing enabled
 Icon=folder-remote
 Exec=@installdir@/mate-user-share
 Terminal=false