Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaas Freitag <freitag@owncloud.com>2014-01-24 16:42:23 +0400
committerKlaas Freitag <freitag@owncloud.com>2014-01-24 16:43:05 +0400
commitf32d90165302b2ec0eb38111a7f9836bc815f7e6 (patch)
tree9131e90d4537f1406f5add9ad2166c993201f122
parentc585c73044260c36bfc4d86fe7189bfaf1bb7aee (diff)
Remove ocsyncs config which is unused in the owncloud client.
-rw-r--r--csync/CMakeLists.txt1
-rw-r--r--csync/config/CMakeLists.txt10
-rw-r--r--csync/config/ocsync.conf16
-rw-r--r--csync/config/ocsync_exclude.conf47
4 files changed, 0 insertions, 74 deletions
diff --git a/csync/CMakeLists.txt b/csync/CMakeLists.txt
index 87473ecb7..e6d0added 100644
--- a/csync/CMakeLists.txt
+++ b/csync/CMakeLists.txt
@@ -46,7 +46,6 @@ if (MEM_NULL_TESTS)
endif (MEM_NULL_TESTS)
add_subdirectory(src)
-add_subdirectory(config)
if (CMOCKA_FOUND AND UNIT_TESTING)
add_subdirectory(tests)
diff --git a/csync/config/CMakeLists.txt b/csync/config/CMakeLists.txt
deleted file mode 100644
index da2c51c69..000000000
--- a/csync/config/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/ocsync.conf ${CMAKE_CURRENT_BINARY_DIR}/ocsync.conf)
-macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/ocsync_exclude.conf ${CMAKE_CURRENT_BINARY_DIR}/ocsync_exclude.conf)
-
-install(
- FILES
- ocsync.conf
- ocsync_exclude.conf
- DESTINATION
- ${SYSCONF_INSTALL_DIR}/ocsync
-)
diff --git a/csync/config/ocsync.conf b/csync/config/ocsync.conf
deleted file mode 100644
index fa537f5e1..000000000
--- a/csync/config/ocsync.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# max diff time between two recplicas in seconds
-max_time_difference = 10
-
-# max directory depth recursion
-max_depth = 50
-
-# NOT IN USE:
-# sync symbolic links if the remote filesystem supports it.
-#sync_symbolic_links = false
-
-# connection timeout in seconds
-timeout = 30
-
-# create a copy for backup for the file which has a conflict
-#with_confilct_copies = no
-
diff --git a/csync/config/ocsync_exclude.conf b/csync/config/ocsync_exclude.conf
deleted file mode 100644
index d2b4dda85..000000000
--- a/csync/config/ocsync_exclude.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-# Exclude patterns (one per line). Blank lines in the file and
-# lines starting with '#' are ignored.
-#
-# You can use shell wildcard patterns. See the manpage of sh(1)
-#
-# If a pattern starts with ']', the ']' is removed from the pattern,
-# And the files that matches that pattern will be ignored, but if
-# their parent directory is removed on the other side, the file will
-# be removed. Otherwise, ignored file prevent the directory from
-# being removed.
-
-.beagle
-.ccache
-.csync*
-.fontconfig
-.java/
-.jpi_cache
-.kde*/cache-*
-.kde*/socket-*
-.kde*/tmp-*
-.mozilla/plugins
-.mozilla/firefox/*/Cache
-.netscape/cache/
-.snapshot
-.thumbnails
-
-*.~*
-]*.directory
-
-# exclude all object file
-# *.o
-
-# exclude all bak files
-# *.bak
-#
-
-# ignore conflict files.
-*_conflict-*
-
-.Temporary Items
-.Trashes
-.Document Revisions-V100
-.fseventd
-.apdisk
-
-.htaccess
-