diff options
| author | Martin Wimpress <[email protected]> | 2015-09-23 16:42:56 +0100 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2015-09-23 16:42:56 +0100 |
| commit | 9712b02bf86cf5a4f8bab7e55a156e2ac937e315 (patch) | |
| tree | 9acaa6921e58b65410fd56f9773f450f039c7b8f /data | |
| parent | dadcc6243c6f3a7bcf7aba443816c50e987fc6e4 (diff) | |
| parent | 1d22e70e9aa963f762391ca1eacfcbf16bb4375e (diff) | |
| download | mate-user-share-9712b02bf86cf5a4f8bab7e55a156e2ac937e315.tar.bz2 mate-user-share-9712b02bf86cf5a4f8bab7e55a156e2ac937e315.tar.xz | |
Merge pull request #35 from monsta/ancient
some cleanup
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/dav_user_2.0.conf | 40 |
2 files changed, 1 insertions, 41 deletions
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 |