angestoepselt/homepage
5
0
Fork 0
mirror of https://codeberg.org/angestoepselt/homepage.git synced 2025-05-24 14:46:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix container startup problems

Browse source
This commit is contained in:
Yannik Rödel 2022-03-16 15:58:55 +01:00
parent 5d0a8f4490
commit 5b84a20963
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cgi-bin/form.py
View file

@ -22,8 +22,6 @@ def fail(status: str, reason: str) -> None:
SITE_DIRECTORY = os.environ.get("SITE_DIRECTORY", "") SITE_DIRECTORY = os.environ.get("SITE_DIRECTORY", "")
if SITE_DIRECTORY == "":
fail("503 Service Unavailable", "Cannot open site directory")
request_uri = os.environ.get("REQUEST_URI", "").lower().rstrip("/") request_uri = os.environ.get("REQUEST_URI", "").lower().rstrip("/")
serializer = itsdangerous.URLSafeSerializer("secret key", "salt") serializer = itsdangerous.URLSafeSerializer("secret key", "salt")
@ -183,11 +181,9 @@ match request_uri:
ticket_details["Kontaktformular"] = form_name ticket_details["Kontaktformular"] = form_name
ZAMMAD_URL = os.environ.get("ZAMMAD_URL", "https://ticket.z31.it").rstrip("/") ZAMMAD_URL = os.environ.get("ZAMMAD_URL", "").rstrip("/")
ZAMMAD_TOKEN = os.environ.get("ZAMMAD_TOKEN", "") ZAMMAD_TOKEN = os.environ.get("ZAMMAD_TOKEN", "")
if ZAMMAD_TOKEN == "": ZAMMAD_GROUP = os.environ.get("ZAMMAD_GROUP", "")
fail("503 Service Unavailable", "Could not get Zammad token")
ZAMMAD_GROUP = os.environ.get("ZAMMAD_GROUP", "testgruppe")
session = requests.Session() session = requests.Session()
session.headers.update(Authorization=f"Token token={ZAMMAD_TOKEN}") session.headers.update(Authorization=f"Token token={ZAMMAD_TOKEN}")

6
flake.nix
View file

@ -53,7 +53,11 @@
config = { config = {
Env = [ Env = [
"SITE_DIRECTORY=\"${packages.site}\"" "SITE_DIRECTORY=${packages.site}"
# We need to provide these default variables because otherwise
# lighttpd doesn't even parse its configuration file:
"ZAMMAD_URL=https://ticket.z31.it"
"ZAMMAD_GROUP=testgruppe"
]; ];
Cmd = [ Cmd = [
"${pkgs.lighttpd}/bin/lighttpd" "${pkgs.lighttpd}/bin/lighttpd"

9
httpd.conf
View file

@ -1,4 +1,4 @@
server.modules += ( "mod_alias", "mod_cgi", "mod_rewrite" ) server.modules += ( "mod_alias", "mod_cgi", "mod_rewrite", "mod_setenv" )
server.port = 80 server.port = 80
@ -30,4 +30,11 @@ $HTTP["url"] =~ "^/cgi-bin/" {
cgi.x-sendfile = "enable" cgi.x-sendfile = "enable"
cgi.x-sendfile-docroot = ( "@site@" ) cgi.x-sendfile-docroot = ( "@site@" )
setenv.set-environment = (
"SITE_DIRECTORY" => env.SITE_DIRECTORY,
"ZAMMAD_URL" => env.ZAMMAD_URL,
"ZAMMAD_TOKEN" => env.ZAMMAD_TOKEN,
"ZAMMAD_GROUP" => env.ZAMMAD_GROUP
)
} }