From 282bf381dba14782c33902beab152f31e262a2ce Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 24 Nov 2019 22:20:36 +0100 Subject: [PATCH] yWeb: fix popup logos; move special logo path to "/var/tuxbox/httpd/logo" Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f1edb41ab4462e27f815403f6f314d9ac3e9ae6f Author: vanhofen Date: 2019-11-24 (Sun, 24 Nov 2019) Origin message was: ------------------ - yWeb: fix popup logos; move special logo path to "/var/tuxbox/httpd/logo" --- src/neutrino.cpp | 1 + src/nhttpd/nhttpd.conf.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 812748428..9635ce9c8 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2953,6 +2953,7 @@ TIMER_START(); CFileHelpers::createDir(WEBRADIODIR_VAR); CFileHelpers::createDir(WEBTVDIR_VAR); CFileHelpers::createDir(PUBLIC_HTTPDDIR); + CFileHelpers::createDir(PUBLIC_HTTPDDIR "/logo"); CWeather::getInstance()->setCoords(g_settings.weather_location, g_settings.weather_city); diff --git a/src/nhttpd/nhttpd.conf.in b/src/nhttpd/nhttpd.conf.in index 5d249142b..5ecd2ab34 100644 --- a/src/nhttpd/nhttpd.conf.in +++ b/src/nhttpd/nhttpd.conf.in @@ -1,6 +1,6 @@ Language.directory=languages Language.selected=Deutsch -Tuxbox.LogosURL=@TARGET_ICONSDIR@/logo +Tuxbox.LogosURL=@TARGET_PUBLIC_HTTPDDIR@/logo WebsiteMain.directory=@TARGET_PRIVATE_HTTPDDIR@ WebsiteMain.override_directory=@TARGET_PUBLIC_HTTPDDIR@ WebsiteMain.port=80