diff --git a/bin/CryptoBoxWebserver b/bin/CryptoBoxWebserver
index 7b15c94..2f17b87 100755
--- a/bin/CryptoBoxWebserver
+++ b/bin/CryptoBoxWebserver
@@ -63,8 +63,8 @@ except:
sys.exit(1)
-# TODO: change this for the release version
-SERVER_ENVIRONMENT = "development"
+# TODO: change this for the release version [development|production]
+SERVER_ENVIRONMENT = "production"
class CryptoBoxWebserver:
'''this class starts the cherryp webserver and serves the single sites'''
@@ -204,6 +204,8 @@ def parseOptions():
## we do not expect any remaining arguments
if len(args) != 0:
parser.error("unknown argument: %s" % str(args[0]))
+ if not os.access(options.logfile, os.W_OK):
+ parser.error("could not write to logfile (%s)" % options.logfile)
if not os.path.isdir(options.datadir) or not os.access(options.datadir,os.X_OK):
parser.error("could not access the data directory (%s)" % options.datadir)
try:
diff --git a/design/logo/cbx-text-logo1.png b/design/logo/cbx-text-logo1.png
new file mode 100644
index 0000000..84214ec
Binary files /dev/null and b/design/logo/cbx-text-logo1.png differ
diff --git a/design/logo/cbx-text-logo2.png b/design/logo/cbx-text-logo2.png
new file mode 100644
index 0000000..1d1b9dc
Binary files /dev/null and b/design/logo/cbx-text-logo2.png differ
diff --git a/design/logo/cryptoboxlogogebastel.svg b/design/logo/cryptoboxlogogebastel.svg
new file mode 100644
index 0000000..43acad5
--- /dev/null
+++ b/design/logo/cryptoboxlogogebastel.svg
@@ -0,0 +1,113 @@
+
+
+
diff --git a/design/logo/cryptoboxlogogebastelhintergrundbild.svg b/design/logo/cryptoboxlogogebastelhintergrundbild.svg
new file mode 100644
index 0000000..d058e56
--- /dev/null
+++ b/design/logo/cryptoboxlogogebastelhintergrundbild.svg
@@ -0,0 +1,152 @@
+
+
+
diff --git a/src/cryptobox/core/settings.py b/src/cryptobox/core/settings.py
index f519ea0..762d525 100644
--- a/src/cryptobox/core/settings.py
+++ b/src/cryptobox/core/settings.py
@@ -411,7 +411,7 @@ class CryptoBoxSettings:
except KeyError:
raise CBConfigUndefinedError("Log", "Details")
except IOError:
- raise CBEnvironmentError("could not create the log file (%s)" % \
+ raise CBEnvironmentError("could not write to log file (%s)" % \
self.prefs["Log"]["Details"])
log_handler.setFormatter(
logging.Formatter('%(asctime)s CryptoBox %(levelname)s: %(message)s'))
diff --git a/templates/header.cs b/templates/header.cs
index a5bf50d..73596ec 100644
--- a/templates/header.cs
+++ b/templates/header.cs
@@ -57,11 +57,6 @@
- |
-
-
|
@@ -70,14 +65,18 @@
|
0 ?>
|
|
+
+ |
+
| | |
|