diff --git a/cbox-tree.d/_offline/doc/de/CryptoBox.html b/add-ons-tree.d/_offline/doc/de/CryptoBox.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBox.html rename to add-ons-tree.d/_offline/doc/de/CryptoBox.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxDev.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxDev.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxDev.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxDev.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxDevBackground.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxDevBackground.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxDevBackground.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxDevBackground.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxDevCustomBuild.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxDevCustomBuild.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxDevCustomBuild.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxDevCustomBuild.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxDevCustomConfigure.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxDevCustomConfigure.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxDevCustomConfigure.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxDevCustomConfigure.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxDevKnownProblems.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxDevKnownProblems.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxDevKnownProblems.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxDevKnownProblems.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxDevPreparation.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxDevPreparation.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxDevPreparation.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxDevPreparation.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxDevValidation.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxDevValidation.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxDevValidation.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxDevValidation.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxDevWorkFlow.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxDevWorkFlow.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxDevWorkFlow.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxDevWorkFlow.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxUser.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxUser.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxUser.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxUser.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxUserConfiguration.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxUserConfiguration.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxUserConfiguration.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxUserConfiguration.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxUserDailyUse.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxUserDailyUse.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxUserDailyUse.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxUserDailyUse.html diff --git a/cbox-tree.d/_offline/doc/de/CryptoBoxUserGettingStarted.html b/add-ons-tree.d/_offline/doc/de/CryptoBoxUserGettingStarted.html similarity index 100% rename from cbox-tree.d/_offline/doc/de/CryptoBoxUserGettingStarted.html rename to add-ons-tree.d/_offline/doc/de/CryptoBoxUserGettingStarted.html diff --git a/cbox-tree.d/_offline/doc/de/doc_footer.inc b/add-ons-tree.d/_offline/doc/de/doc_footer.inc similarity index 100% rename from cbox-tree.d/_offline/doc/de/doc_footer.inc rename to add-ons-tree.d/_offline/doc/de/doc_footer.inc diff --git a/cbox-tree.d/_offline/doc/de/doc_header.inc b/add-ons-tree.d/_offline/doc/de/doc_header.inc similarity index 100% rename from cbox-tree.d/_offline/doc/de/doc_header.inc rename to add-ons-tree.d/_offline/doc/de/doc_header.inc diff --git a/cbox-tree.d/_offline/doc/doc_footer.inc b/add-ons-tree.d/_offline/doc/doc_footer.inc similarity index 100% rename from cbox-tree.d/_offline/doc/doc_footer.inc rename to add-ons-tree.d/_offline/doc/doc_footer.inc diff --git a/cbox-tree.d/_offline/doc/doc_header.inc b/add-ons-tree.d/_offline/doc/doc_header.inc similarity index 100% rename from cbox-tree.d/_offline/doc/doc_header.inc rename to add-ons-tree.d/_offline/doc/doc_header.inc diff --git a/cbox-tree.d/_offline/doc/en/CryptoBox.html b/add-ons-tree.d/_offline/doc/en/CryptoBox.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBox.html rename to add-ons-tree.d/_offline/doc/en/CryptoBox.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxDev.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxDev.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxDev.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxDev.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxDevBackground.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxDevBackground.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxDevBackground.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxDevBackground.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxDevCustomBuild.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxDevCustomBuild.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxDevCustomBuild.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxDevCustomBuild.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxDevCustomConfigure.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxDevCustomConfigure.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxDevCustomConfigure.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxDevCustomConfigure.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxDevKnownProblems.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxDevKnownProblems.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxDevKnownProblems.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxDevKnownProblems.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxDevPreparation.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxDevPreparation.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxDevPreparation.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxDevPreparation.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxDevValidation.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxDevValidation.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxDevValidation.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxDevValidation.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxDevWorkFlow.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxDevWorkFlow.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxDevWorkFlow.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxDevWorkFlow.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxUser.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxUser.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxUser.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxUser.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxUserConfiguration.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxUserConfiguration.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxUserConfiguration.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxUserConfiguration.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxUserDailyUse.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxUserDailyUse.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxUserDailyUse.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxUserDailyUse.html diff --git a/cbox-tree.d/_offline/doc/en/CryptoBoxUserGettingStarted.html b/add-ons-tree.d/_offline/doc/en/CryptoBoxUserGettingStarted.html similarity index 100% rename from cbox-tree.d/_offline/doc/en/CryptoBoxUserGettingStarted.html rename to add-ons-tree.d/_offline/doc/en/CryptoBoxUserGettingStarted.html diff --git a/cbox-tree.d/_offline/doc/en/doc_footer.inc b/add-ons-tree.d/_offline/doc/en/doc_footer.inc similarity index 100% rename from cbox-tree.d/_offline/doc/en/doc_footer.inc rename to add-ons-tree.d/_offline/doc/en/doc_footer.inc diff --git a/cbox-tree.d/_offline/doc/en/doc_header.inc b/add-ons-tree.d/_offline/doc/en/doc_header.inc similarity index 100% rename from cbox-tree.d/_offline/doc/en/doc_header.inc rename to add-ons-tree.d/_offline/doc/en/doc_header.inc diff --git a/cbox-tree.d/_offline/shellopn.exe b/add-ons-tree.d/_offline/shellopn.exe similarity index 100% rename from cbox-tree.d/_offline/shellopn.exe rename to add-ons-tree.d/_offline/shellopn.exe diff --git a/cbox-tree.d/_offline/shellopn.zip b/add-ons-tree.d/_offline/shellopn.zip similarity index 100% rename from cbox-tree.d/_offline/shellopn.zip rename to add-ons-tree.d/_offline/shellopn.zip diff --git a/cbox-tree.d/autorun.inf b/add-ons-tree.d/autorun.inf similarity index 100% rename from cbox-tree.d/autorun.inf rename to add-ons-tree.d/autorun.inf diff --git a/cbox-tree.d/etc/samba/smb.conf b/add-ons-tree.d/etc/samba/smb.conf similarity index 100% rename from cbox-tree.d/etc/samba/smb.conf rename to add-ons-tree.d/etc/samba/smb.conf diff --git a/cbox-tree.d/start.html b/add-ons-tree.d/start.html similarity index 100% rename from cbox-tree.d/start.html rename to add-ons-tree.d/start.html diff --git a/cbox-tree.d/usr/lib/perl5/ClearSilver.pm b/add-ons-tree.d/usr/lib/perl5/ClearSilver.pm similarity index 100% rename from cbox-tree.d/usr/lib/perl5/ClearSilver.pm rename to add-ons-tree.d/usr/lib/perl5/ClearSilver.pm diff --git a/cbox-tree.d/usr/lib/perl5/auto/ClearSilver/.packlist b/add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/.packlist similarity index 100% rename from cbox-tree.d/usr/lib/perl5/auto/ClearSilver/.packlist rename to add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/.packlist diff --git a/cbox-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs b/add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs similarity index 100% rename from cbox-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs rename to add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs diff --git a/cbox-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.so b/add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.so similarity index 100% rename from cbox-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.so rename to add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.so diff --git a/cbox-tree.d/var/www/errors/err404.html b/add-ons-tree.d/var/www/errors/err404.html similarity index 100% rename from cbox-tree.d/var/www/errors/err404.html rename to add-ons-tree.d/var/www/errors/err404.html diff --git a/cbox-tree.d/var/www/favicon.ico b/add-ons-tree.d/var/www/favicon.ico similarity index 100% rename from cbox-tree.d/var/www/favicon.ico rename to add-ons-tree.d/var/www/favicon.ico diff --git a/cbox-tree.d/var/www/index.html b/add-ons-tree.d/var/www/index.html similarity index 100% rename from cbox-tree.d/var/www/index.html rename to add-ons-tree.d/var/www/index.html diff --git a/cbox-tree.d/DEBIAN/control b/cbox-tree.d/DEBIAN/control new file mode 100644 index 0000000..fa1519c --- /dev/null +++ b/cbox-tree.d/DEBIAN/control @@ -0,0 +1,24 @@ +Package: cryptobox +Version: 0.3.0-1 +Section: base +Priority: optional +Architecture: all +Depends: bash, sed, coreutils, grep, perl, httpd, httpd-cgi, perl, iptables, sysutils, samba, stunnel, hashalot, libconfig-perl, cryptsetup-luks, dmsetup, cron +Maintainer: Lars Kruse +Conffiles: + /etc/cron.d/cryptobox + /etc/cryptobox/cryptobox.conf + /etc/cryptobox/openssl.conf + /etc/cryptobox/revision + +Description: Web interface for encrypting fileserver + This bundle of scripts and cgis allow you to manage an encrypted harddisk + via a web interface. The data is platform independently available + via samba file shares. + Even non-technical users are able to encrypt their private data with the + CryptoBox. + This package depends on the following packages, that are not part of the main + debian distribution: + * cryptsetup_luks - http://luks.endorphin.org/masses + * clearsilver (perl bindings) - http://www.clearsilver.net/downloads/ + diff --git a/etc-defaults.d/cbox-dev.conf b/etc-defaults.d/cbox-dev.conf index 8dbe863..a71d529 100644 --- a/etc-defaults.d/cbox-dev.conf +++ b/etc-defaults.d/cbox-dev.conf @@ -12,6 +12,7 @@ BUILD_DIR="$ROOT_DIR/_builddir" # the cryptobox development files TEMPLATE_DIR="$ROOT_DIR/cbox-tree.d" +TEMPLATE_EXTRAS_DIR="$ROOT_DIR/add-ons-tree.d" # the iso image IMAGE_FILE="$BUILD_DIR/cryptobox.iso" diff --git a/scripts/cbox-build.sh b/scripts/cbox-build.sh index f68c20c..2a0cd69 100755 --- a/scripts/cbox-build.sh +++ b/scripts/cbox-build.sh @@ -97,10 +97,12 @@ function configure_cb() exit 1 fi - echo "Copying files to the box ..." - [ -e "$TMP_DIR" ] && rm -rf "$TMP_DIR" +echo "Copying base files to the box ..." svn export --force "$TEMPLATE_DIR/." "$IMAGE_DIR" + echo "Copying add-on files to the box ..." + svn export --force "$TEMPLATE_EXTRAS_DIR/." "$IMAGE_DIR" + echo "Configuring the cryptobox ..." chroot "$IMAGE_DIR" "$CHROOT_START" /usr/lib/cryptobox/configure-cryptobox.sh normal