From 7e500b232dbc183e33f636050106361445e38d40 Mon Sep 17 00:00:00 2001 From: lars Date: Thu, 9 Nov 2006 11:49:31 +0000 Subject: [PATCH] some example configuration files for hook scripts added removed obsolete configuration files (old perl version) --- conf-examples/apache2_dav-share.conf-template | 9 +++++ conf-examples/apache2_dav.conf | 11 ++++++ conf-examples/cryptobox.conf | 36 ------------------- .../default-settings/cryptobox.marker | 0 conf-examples/default-settings/ip | 1 - conf-examples/default-settings/language | 1 - conf-examples/default-settings/names.db | 0 conf-examples/default-settings/timeout | 1 - conf-examples/default-settings/version | 1 - conf-examples/distributions/README | 11 ------ conf-examples/distributions/gnu_linux | 12 ------- .../admin_pw => samba-include.conf} | 0 conf-examples/samba-share.conf-template | 6 ++++ 13 files changed, 26 insertions(+), 63 deletions(-) create mode 100644 conf-examples/apache2_dav-share.conf-template create mode 100644 conf-examples/apache2_dav.conf delete mode 100644 conf-examples/cryptobox.conf delete mode 100644 conf-examples/default-settings/cryptobox.marker delete mode 100644 conf-examples/default-settings/ip delete mode 100644 conf-examples/default-settings/language delete mode 100644 conf-examples/default-settings/names.db delete mode 100644 conf-examples/default-settings/timeout delete mode 100644 conf-examples/default-settings/version delete mode 100644 conf-examples/distributions/README delete mode 100644 conf-examples/distributions/gnu_linux rename conf-examples/{default-settings/admin_pw => samba-include.conf} (100%) create mode 100644 conf-examples/samba-share.conf-template diff --git a/conf-examples/apache2_dav-share.conf-template b/conf-examples/apache2_dav-share.conf-template new file mode 100644 index 0000000..9120e25 --- /dev/null +++ b/conf-examples/apache2_dav-share.conf-template @@ -0,0 +1,9 @@ +# this file is part of the CryptoBox +# put it into /etc/cryptobox/apache2_dav-share.conf-template + +Alias "/cryptobox/_VOLUME_NAME_" "_SHARE_DIR_" + + + Dav filesystem + + diff --git a/conf-examples/apache2_dav.conf b/conf-examples/apache2_dav.conf new file mode 100644 index 0000000..0cb3c62 --- /dev/null +++ b/conf-examples/apache2_dav.conf @@ -0,0 +1,11 @@ +# this file is part of the CryptoBox +# put it into /etc/apache2/conf.d/ + + + # lock database - should be writeable for www-data + DavLockDB /tmp/dav_lock.db + # a longer value than the default (120) help for high-latency networks + DavMinTimeout 600 + # include the configuration file, that will contain "include" lines for every share + Include /etc/cryptobox/apache2_dav-includes.conf + diff --git a/conf-examples/cryptobox.conf b/conf-examples/cryptobox.conf deleted file mode 100644 index 4ac399a..0000000 --- a/conf-examples/cryptobox.conf +++ /dev/null @@ -1,36 +0,0 @@ -# this file is directly sourced by some bash scripts -# so there should be no space around the "=" - -LANGUAGE=en -CRYPTOBOX_USER=cryptobox -SCAN_DEVICES="sd loop" - -# web interface -HTML_TEMPLATE_DIR=/usr/share/cryptobox/templates -STYLESHEET_URL=/cryptobox-misc/cryptobox.css - -# directories -LANGUAGE_DIR=/usr/share/cryptobox/lang -DOC_DIR=/usr/share/doc/cryptobox/html -CONFIG_DEFAULTS_DIR=/usr/share/cryptobox/defaults - -# some files -LOG_FILE=/var/log/cryptobox.log - -# crypto settings -# TODO: for now, the usual default cipher does not work on ARM, so we enable it during development -#DEFAULT_CIPHER=aes-cbc-essiv:sha256 -DEFAULT_CIPHER=aes -DEV_MAPPER_DIR=/dev/mapper - -# distribution specific configuration -# examples can be found in /usr/local/share/cryptobox/distributions -DISTRIBUTION_CONF=/etc/cryptobox/distribution.conf - -# choose a debug level: -# 0 => no debug messages at all -# 1 => critical errors (default) -# 2 => warning messages -# 3 => information -DEBUG_LEVEL=1 - diff --git a/conf-examples/default-settings/cryptobox.marker b/conf-examples/default-settings/cryptobox.marker deleted file mode 100644 index e69de29..0000000 diff --git a/conf-examples/default-settings/ip b/conf-examples/default-settings/ip deleted file mode 100644 index 1cad3c7..0000000 --- a/conf-examples/default-settings/ip +++ /dev/null @@ -1 +0,0 @@ -192.168.0.23 diff --git a/conf-examples/default-settings/language b/conf-examples/default-settings/language deleted file mode 100644 index c574d07..0000000 --- a/conf-examples/default-settings/language +++ /dev/null @@ -1 +0,0 @@ -en diff --git a/conf-examples/default-settings/names.db b/conf-examples/default-settings/names.db deleted file mode 100644 index e69de29..0000000 diff --git a/conf-examples/default-settings/timeout b/conf-examples/default-settings/timeout deleted file mode 100644 index 64bb6b7..0000000 --- a/conf-examples/default-settings/timeout +++ /dev/null @@ -1 +0,0 @@ -30 diff --git a/conf-examples/default-settings/version b/conf-examples/default-settings/version deleted file mode 100644 index be58634..0000000 --- a/conf-examples/default-settings/version +++ /dev/null @@ -1 +0,0 @@ -0.3 diff --git a/conf-examples/distributions/README b/conf-examples/distributions/README deleted file mode 100644 index 7a9edfa..0000000 --- a/conf-examples/distributions/README +++ /dev/null @@ -1,11 +0,0 @@ -You need to copy one of these files to /etc/cryptobox/distribution.conf. -Choose the one, that fits to your particular operating system - if you are -not sure which operation system you are using, then you should run - uname -o -to get to know yourself :) - -If the file for your specific operating system is not available, then you -may consider to send a copy of the one you wrote for yourself to - devel@systemausfall.org. -Thanks! - diff --git a/conf-examples/distributions/gnu_linux b/conf-examples/distributions/gnu_linux deleted file mode 100644 index 7bf9377..0000000 --- a/conf-examples/distributions/gnu_linux +++ /dev/null @@ -1,12 +0,0 @@ -# program locations for debian -SFDISK=/sbin/sfdisk -MKFS_DATA=/sbin/mkfs.ext3 -MKFS_CONFIG=/sbin/mkfs.ext2 -CRYPTSETUP=/sbin/cryptsetup -IFCONFIG=/sbin/ifconfig -PMOUNT=/bin/pmount -PUMOUNT=/bin/pumount -BLKID=/sbin/blkid -POWEROFF=/sbin/poweroff -REBOOT=/sbin/reboot - diff --git a/conf-examples/default-settings/admin_pw b/conf-examples/samba-include.conf similarity index 100% rename from conf-examples/default-settings/admin_pw rename to conf-examples/samba-include.conf diff --git a/conf-examples/samba-share.conf-template b/conf-examples/samba-share.conf-template new file mode 100644 index 0000000..a8e516c --- /dev/null +++ b/conf-examples/samba-share.conf-template @@ -0,0 +1,6 @@ +[_VOLUME_NAME_] + comment = CryptoBox share + path = _SHARE_DIR_ + read only = yes + guest ok = yes +