restored most css changes ('inherit' is not good)

filter mkfs-output to improve html compliance of log display
changed order of runlevel scripts to enable copying of cert during config-up
This commit is contained in:
lars 2005-10-02 21:05:29 +00:00
parent a2db4f7e80
commit 31da7aaab0
5 changed files with 10 additions and 25 deletions

View File

@ -95,7 +95,8 @@ function create_config()
{
local device="${1}1"
log_msg "Creating config filesystem ..."
$MKFS_CONFIG "$device"
# filter output through 'tr' to replace tabs
$MKFS_CONFIG "$device" | tr '\010' ' '
# mount the config partition rw
log_msg "Mounting config partition ..."
mount "$device" "$CONFIG_DIR"
@ -148,7 +149,8 @@ function mkfs_crypto()
# TODO: this takes _much_ too long - maybe add a "secure wipe" switch to the interface?
#dd if=/dev/urandom of="${device}2" bs=512
$MKFS_DATA "$CRYPTMAPPER_DEV"
# filter output through 'tr' to replace tabs
$MKFS_DATA "$CRYPTMAPPER_DEV" | tr '\0101' ' '
}
@ -225,6 +227,7 @@ function mount_config()
then log_msg "configuraton found on $device"
config_set_value "device" "$device"
# copy certificate to /tmp in case of re-initialization
# /tmp should be writable, so tmpfs has to be mounted before (/etc/rcS.d)
cp "$CERT_FILE" "$CERT_TEMP"
return 0
else log_msg "failed to locate harddisk"
@ -278,7 +281,7 @@ function umount_crypto()
function init_cryptobox_part1()
# this is only the first part of initialisation that takes no time - good for a smooth web interface
{
local device=`find_harddisk`
local device=$(find_harddisk)
[ -z "$device" ] && log_msg 'no valid harddisk found!' && return 1
(
log_msg "Initializing crypto partition on $device ..."

View File

@ -34,7 +34,7 @@ case "$ACTION" in
/etc/init.d/thttpd restart
# start ssh daemon
/etc/init.d/ssh start
[ -x /etc/init.d/ssh ] && /etc/init.d/ssh start
;;
set_diff_base )
# the present content of the tmpfs mirror get copied to
@ -54,7 +54,7 @@ case "$ACTION" in
diff -ruN --exclude=report --exclude=cryptobox.pl --exclude=index.html "`basename \"$MIRROR_ORIG_DIR\"`" "`basename \"$MIRROR_DIR\"`" | grep -v "^Binary files" | sed 's#/var/www/cryptobox\t#/var/www/cgi-bin/cryptobox.pl\t#'
;;
stop )
/etc/init.d/ssh stop
[ -x /etc/init.d/ssh ] && /etc/init.d/ssh stop
for a in $WRITE_DIRS
do umount "$MIRROR_DIR/$a"
done

View File

@ -22,7 +22,6 @@ body {
font-weight: normal;
letter-spacing: 0.05em;
color: #acacac;
background-color: white;
font-variant: small-caps;
padding: 0 1em;
text-align: left;
@ -62,7 +61,6 @@ body {
#content a {
line-height: 1.2em;
color: black;
background-color: inherit;
text-decoration: none;
font-weight: bold;
font-size: 0.9em;
@ -74,7 +72,6 @@ body {
#content a:visited {
color: #acacac;
background-color: inherit;
}
#content p {
@ -87,7 +84,6 @@ body {
text-align: center;
border-top: 1px solid #5e5e5e;
border-bottom: 1px solid #5e5e5e;
color: inherit;
background-color: #ACE149;
}
@ -103,7 +99,6 @@ body {
#menu a:hover {
color: #8e8e8e;
background-color: inherit;
}
#words {
@ -147,7 +142,6 @@ body {
#footer a:link, #footer a:visited {
color: #5e5e5e;
background-color: inherit;
margin: 5px;
text-decoration: none;
border: none;
@ -160,7 +154,6 @@ body {
#confirmtext span {
color: red;
background-color: inherit;
font-weight: bold;
}
@ -173,14 +166,12 @@ body {
padding-top: 10px;
padding-bottom: 15px;
color: #707070;
background-color: inherit;
}
#words .warning,.error,.success {
border: 1px dashed #808080;
text-align: center;
color: #5e5e5e;
background-color: inherit;
text-decoration: none;
font-weight: bold;
font-size: 0.9em;
@ -189,28 +180,24 @@ body {
}
#words .warning {
color: inherit;
background-color: #f5f5f5;
}
#words .error {
color: inherit;
background-color: #f5f5f5;
}
#words .success {
/* color: inherit;
background-color: #90EE90; */
/* nice green color - but no one likes it right?
background-color: #90EE90; */
}
#words div.warning,div.error,div.success h1,h2 {
color: #808080;
background-color: inherit;
}
#words .warning,.error,.success a {
color: #5e5e5e;
background-color: inherit;
text-decoration: none;
font-weight: bold;
font-size: 0.9em;
@ -219,7 +206,6 @@ body {
#words .note {
text-align: center;
color: #F48659;
background-color: inherit;
font-style: italic;
}
@ -245,7 +231,6 @@ textarea {
font-size: 1.1em;
border: 1px solid #BFBFBF;
color: #949494;
background-color: inherit;
padding: 2px 5px 1px 5px;
width: 450px;
}
@ -294,14 +279,12 @@ button:hover {
#lang a {
color: #acacac;
background-color: inherit;
font-family: verdana, lucida, arial, helvetica, sans-serif;
font-size: smaller;
}
#lang a:hover {
color: #707070;
background-color: inherit;
}
@ -378,6 +361,5 @@ button:hover {
#words a.popup span h3 {
color: #909090;
background-color: inherit;
margin-top: 0px;
}