Browse Source

added subversion's "Id" and "Revision" tags to most files

removed manual extraction of revision from cbox-build.sh
master
lars 16 years ago
parent
commit
fcd86832f1
  1. 1
      cbox-tree.d/etc/cryptobox/revision
  2. 1
      cbox-tree.d/etc/issue
  3. 1
      cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
  4. 1
      cbox-tree.d/usr/lib/cryptobox/check_smb_idle.sh
  5. 1
      cbox-tree.d/usr/lib/cryptobox/chroot-start.sh
  6. 1
      cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh
  7. 1
      cbox-tree.d/usr/lib/cryptobox/devel-features.sh
  8. 1
      cbox-tree.d/usr/lib/cryptobox/firewall.sh
  9. 1
      cbox-tree.d/usr/lib/cryptobox/make_stunnel_cert.sh
  10. 2
      cbox-tree.d/usr/share/cryptobox/lang/README
  11. 8
      cbox-tree.d/usr/share/cryptobox/lang/TODO
  12. 2
      cbox-tree.d/usr/share/cryptobox/lang/de.hdf
  13. 2
      cbox-tree.d/usr/share/cryptobox/lang/en.hdf
  14. 2
      cbox-tree.d/usr/share/cryptobox/lang/si.hdf
  15. 2
      cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
  16. 2
      cbox-tree.d/usr/share/cryptobox/templates/doc.cs
  17. 2
      cbox-tree.d/usr/share/cryptobox/templates/empty.cs
  18. 2
      cbox-tree.d/usr/share/cryptobox/templates/error.cs
  19. 4
      cbox-tree.d/usr/share/cryptobox/templates/footer.cs
  20. 2
      cbox-tree.d/usr/share/cryptobox/templates/header.cs
  21. 2
      cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
  22. 2
      cbox-tree.d/usr/share/cryptobox/templates/macros.cs
  23. 2
      cbox-tree.d/usr/share/cryptobox/templates/main.cs
  24. 2
      cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
  25. 2
      cbox-tree.d/usr/share/cryptobox/templates/nav.cs
  26. 2
      cbox-tree.d/usr/share/cryptobox/templates/show_log.cs
  27. 2
      cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
  28. 2
      cbox-tree.d/usr/share/cryptobox/templates/status.cs
  29. 2
      cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
  30. 1
      cbox-tree.d/var/www/cgi-bin/cryptobox.pl
  31. 2
      etc-defaults.d/dfs-cbox.conf
  32. 20
      scripts/cbox-build.sh
  33. 1
      scripts/cbox-dev.sh

1
cbox-tree.d/etc/cryptobox/revision

@ -0,0 +1 @@
$Revision$

1
cbox-tree.d/etc/issue

@ -0,0 +1 @@
CryptoBox r$Revision$

1
cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh

@ -1,4 +1,5 @@
#!/bin/sh
# $Id$
#
# this script does EVERYTHING
# all other scripts are only frontends :)

1
cbox-tree.d/usr/lib/cryptobox/check_smb_idle.sh

@ -1,4 +1,5 @@
#!/bin/sh
# $Id$
#
# a simple script to check, if there was no smb traffic for the specified
# number of minutes - then it unmounts the crypto partition

1
cbox-tree.d/usr/lib/cryptobox/chroot-start.sh

@ -1,4 +1,5 @@
#!/bin/sh
# $Id$
#
# FOR DEVELOPMENT ONLY!
#

1
cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh

@ -1,4 +1,5 @@
#!/bin/sh
# $Id$
#
# this script is part of the building process of the cryptobox
# the "normal" action is necessary for every cryptobox (development & release)

1
cbox-tree.d/usr/lib/cryptobox/devel-features.sh

@ -1,4 +1,5 @@
#!/bin/sh
# $Id$
#
# this script is part of the boot process of a developer's cryptobox
#

1
cbox-tree.d/usr/lib/cryptobox/firewall.sh

@ -1,4 +1,5 @@
#!/bin/sh
# $Id$
#
# set up the firewall of the cryptobox
#

1
cbox-tree.d/usr/lib/cryptobox/make_stunnel_cert.sh

@ -1,4 +1,5 @@
#!/bin/sh
# $Id$
#
# this script creates the stunnel certificate for https
#

2
cbox-tree.d/usr/share/cryptobox/lang/README

@ -1,3 +1,5 @@
$Id$
You may want to translate the CryptoBox into another language?
Most welcome!

8
cbox-tree.d/usr/share/cryptobox/lang/TODO

@ -1,7 +1,11 @@
$Id$
Here are some minor fixes that have to be done. Thanks a lot for your
help!
slovenian:
################################ slovenian ##################################
- SuccessMessage.InitRunning contains only the first sentence
- SuccessMessage.ReBoot: add a hint for automatic redirection (3rd sentence)
- EmptyCryptoPassword: change 'Text' accordingly to English string.
@ -9,4 +13,4 @@ slovenian:
Below are some smaller changes in English sentences. Someone may change it accordingly.
- MountFailed: add 'Pleasy try again' to the end of the string.
- UmountFailed: changed 'Also close all unclean programs' to 'Close all unclean programs'.
- InitRunning: changed 'You may configure it now. You may activate the encrypted filesystem in a few minutes.' to 'You may configure it now and activate the encrypted filesystem in a few minutes.'
- InitRunning: changed 'You may configure it now. You may activate the encrypted filesystem in a few minutes.' to 'You may configure it now and activate the encrypted filesystem in a few minutes.'

2
cbox-tree.d/usr/share/cryptobox/lang/de.hdf

@ -2,6 +2,8 @@ Lang {
Name = deutsch
Status = $Id$
Title {
Top = Die CryptoBox
Slogan = ... und 1984 war gestern!

2
cbox-tree.d/usr/share/cryptobox/lang/en.hdf

@ -2,6 +2,8 @@ Lang {
Name = english
Status = $Id$
Title {
Top = The CryptoBox
Slogan = Privacy for the rest of us.

2
cbox-tree.d/usr/share/cryptobox/lang/si.hdf

@ -2,6 +2,8 @@ Lang {
Name = slovenščina
Status = $Id$
Title {
Top = The CryptoBox
Slogan = Privatnost v vsako vas!

2
cbox-tree.d/usr/share/cryptobox/templates/config_form.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<div id="config">
<h1><?cs var:Lang.Title.Config ?></h1>

2
cbox-tree.d/usr/share/cryptobox/templates/doc.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<div id="doc">
<?cs include:Settings.DocDir + '/' + Settings.DocLang + '/' + Data.Doc.Page + '.html' ?>

2
cbox-tree.d/usr/share/cryptobox/templates/empty.cs

@ -1 +1,3 @@
<!-- $Id$ -->
<!-- what else would you expect here? -->

2
cbox-tree.d/usr/share/cryptobox/templates/error.cs

@ -1 +1,3 @@
<!-- $Id$ -->
<?cs call:error(Data.Error) ?>

4
cbox-tree.d/usr/share/cryptobox/templates/footer.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<?cs if:Data.Redirect ?>
<p class="warning"><a href="<?cs if:Data.Redirect.URL ?><?cs var:Data.Redirect.URL ?><?cs else ?><?cs call:getSelfURL('action=' + Data.Redirect.Action, '') ?><?cs /if ?>"><?cs var:Lang.Text.RedirectNote ?></a></p>
<?cs /if ?>
@ -23,5 +25,7 @@ Data.Status.IP=<?cs var:Data.Status.IP ?>
Data.Status.Mounted=<?cs var:Data.Status.Mounted ?>
CBOX-STATUS-end -->
<!-- $Revision$ -->
</body>
</html>

2
cbox-tree.d/usr/share/cryptobox/templates/header.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">

2
cbox-tree.d/usr/share/cryptobox/templates/init_form.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<h1><?cs var:Lang.Title.Init ?></h1>
<div class="init">

2
cbox-tree.d/usr/share/cryptobox/templates/macros.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<?cs def:warning(warnname) ?><?cs
each:item = Lang.WarningMessage ?><?cs
if:(name(item) == warnname)

2
cbox-tree.d/usr/share/cryptobox/templates/main.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<?cs include:Settings.TemplateDir + '/macros.cs' ?>
<?cs include:Settings.TemplateDir + '/header.cs' ?>

2
cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<h1><?cs var:Lang.Title.Mount ?></h1>
<div align="center">

2
cbox-tree.d/usr/share/cryptobox/templates/nav.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<!-- mounting possible? -->
<?cs if:((Data.Status.Config == 1) && (Data.Status.InitRunning == 0)) ?>
<?cs if:(Data.Status.Mounted == 1) ?>

2
cbox-tree.d/usr/share/cryptobox/templates/show_log.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<div id="log">
<h1><?cs var:Lang.Title.Log ?></h1>

2
cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<h1><?cs var:Lang.Title.ShutDown ?></h1>
<div align="center">

2
cbox-tree.d/usr/share/cryptobox/templates/status.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<h1><?cs var:Lang.Title.Status ?></h1>
<p><?cs if:(Data.Status.Mounted == 1) ?><?cs var:Lang.Text.CryptoIsActive ?>
<?cs else ?><?cs var:Lang.Text.CryptoIsDown ?><?cs /if ?></p>

2
cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs

@ -1,3 +1,5 @@
<!-- $Id$ -->
<h1><?cs var:Lang.Title.Umount ?></h1>
<div align="center">

1
cbox-tree.d/var/www/cgi-bin/cryptobox.pl

@ -1,4 +1,5 @@
#!/usr/bin/perl
# $Id$
#
# web interface of the CryptoBox
#

2
etc-defaults.d/dfs-cbox.conf

@ -214,8 +214,6 @@ arch = amd64
# /etc/modules =
/etc/issue = This is the CryptoBox!
/etc/profile = export TERM=vt100
######################################################################

20
scripts/cbox-build.sh

@ -1,4 +1,5 @@
#!/bin/sh
# $Id$
#
# managing our work at the cryptobox
#
@ -88,19 +89,9 @@ function configure_cb()
echo "Copying files to the box ..."
[ -e "$TMP_DIR" ] && rm -rf "$TMP_DIR"
cp -dr "$TEMPLATE_DIR/." "$TMP_DIR"
rm -rf `find "$TMP_DIR" -type d -name ".svn"`
cp -dr "$TMP_DIR/." "$IMAGE_DIR"
rm -rf "$TMP_DIR"
svn export --force "$TEMPLATE_DIR/." "$IMAGE_DIR"
echo "Configuring the cryptobox ..."
# "harden" removes /etc/issue ...
if [ -e "$IMAGE_DIR/etc/issue" ]
then sed -i "s/^Version:/Revision:/" "$IMAGE_DIR/etc/issue"
sed -i "s/^Revision:.*/Revision: $(fetch_revision)/" "$IMAGE_DIR/etc/issue"
else echo "Revision: $(fetch_revision)" >"$IMAGE_DIR/etc/issue"
fi
fetch_revision >"$IMAGE_DIR/etc/cryptobox/revision"
chroot "$IMAGE_DIR" "$CHROOT_START" /usr/lib/cryptobox/configure-cryptobox.sh normal
# source local configure scripts
@ -115,13 +106,6 @@ function configure_cb()
}
function fetch_revision()
{
svn -R info 2>&1 | grep ^Revision| cut -f2 -d " " | sort | tail -1 \
|| echo "unknown release"
}
function blanknburn_cdrw()
{
cdrecord -v dev=$CDWRITER blank=fast

1
scripts/cbox-dev.sh

@ -1,4 +1,5 @@
#!/bin/sh
# $Id$
#
# managing our work at the cryptobox
#

Loading…
Cancel
Save