From 424d2d56034c82ceb1b032f34e8af32eba10694b Mon Sep 17 00:00:00 2001 From: age Date: Wed, 28 Nov 2012 14:17:42 +0000 Subject: [PATCH] alte rumliegende aenderungen --- CryptoBottle/CryptoBottle.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CryptoBottle/CryptoBottle.py b/CryptoBottle/CryptoBottle.py index 589e796..2d60d46 100755 --- a/CryptoBottle/CryptoBottle.py +++ b/CryptoBottle/CryptoBottle.py @@ -24,7 +24,7 @@ from bottle import route, run, post, request, template, debug, TEMPLATES, static_file from subprocess import Popen, PIPE -from os.path import join +import os serverport = 83 cryptcmd = "/sbin/cryptsetup" @@ -35,13 +35,14 @@ mapperpath = "/dev/mapper/" mappername = "vdc1" mntpoint = "/mnt" logo = "logo.png" +basedir = os.getcwd() @route('/style/default.css') def server_static(): - return static_file('default.css', root='/data/cryptobottle-dev/style') -@route(join('/style/', logo)) + return static_file('default.css', root= basedir + '/style') +@route(os.path.join('/style/', logo)) def server_static(): - return static_file(logo, root='/data/cryptobottle-dev/style') + return static_file(logo, root= basedir + '/style') @route('/') def index(): @@ -80,7 +81,7 @@ def cryptopen(): cryptsetup = err elif len(cryptsetup) == 0: cryptsetup = 'erfolgreich entschluesselt' - shell = Popen([mntcmd, join(mapperpath, mappername), mntpoint], stdout=PIPE,stderr=PIPE) + shell = Popen([mntcmd, os.path.join(mapperpath, mappername), mntpoint], stdout=PIPE,stderr=PIPE) (mount, mount_err) = shell.communicate() if mount_err: mount = mount_err