Merge pull request #49 from fhservinga/main

make logo configurable with env vars

README.md

@@ -17,7 +17,7 @@ made user-friendly for everyone to use. It allows you to execute network related
 - Dark/light/auto mode theme.
 
 ### Requirements
-- Any Linux distribution, this has been tested on RHEL 8 + 9.
+- Any Linux distribution, this has been tested on RHEL 8 + 9, for NetBSD users see [#47](https://github.com/hybula/lookingglass/issues/47).
 - PHP 7.1 or higher, PHP 8 preferred.
 - IPv6 connectivity if you want to use the v6 equivalents.
 - Root access.

docker-compose.yml

@@ -22,6 +22,9 @@ services:
       LOCATION: Location
       FACILITY: Facility
       FACILITY_URL: http://localhost/
+      LOGO_URL: https://github.com/hybula/lookingglass/
+      LOGO: '<h2 style="color: #000000;">Company Looking Glass</h2>'
+      LOGO_DARK: '<h2 style="color: #ffffff;">Company Looking Glass</h2>'
       IPV4_ADDRESS: 127.0.0.1
       IPV6_ADDRESS: ::1
       MAPS_QUERY: Amsterdam

docker/php-fpm/Dockerfile

@@ -1,9 +1,11 @@
-FROM php:8.1-fpm-bullseye
+FROM php:8.4-fpm-bullseye
 
 RUN apt-get update && \
     apt-get --no-install-recommends -y install iputils-ping mtr traceroute iproute2 && \
     rm -rf /var/lib/apt/lists/*
 
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
 WORKDIR /var/www/html
 
 COPY --chown=www-data:www-data . .

docker/php-fpm/src/config.php

@@ -5,11 +5,11 @@ use Hybula\LookingGlass;
 const LG_TITLE = 'Looking Glass';
 
 // Define a logo, this can be HTML too, see the other example for an image;
-const LG_LOGO = '<h2 style="color: #000000;">Company Looking Glass</h2>';
-const LG_LOGO_DARK = '<h2 style="color: #ffffff;">Company Looking Glass</h2>';
-
-// Define the URL where the logo points to;
-const LG_LOGO_URL = 'https://github.com/hybula/lookingglass/';
+define('LG_LOGO', getenv('LOGO'));
+define('LG_LOGO_DARK', getenv('LOGO_DARK'));
+ 
+ // Define the URL where the logo points to;
+define('LG_LOGO_URL', getenv('LOGO_URL'));
 
 // Theme mode;
 const LG_THEME = 'auto';
@@ -23,11 +23,11 @@ const LG_CSS_OVERRIDES = false;
 const LG_CUSTOM_HEAD = false;
 
 // Enable or disable blocks/parts of the LG, pass these environment variables with any value to disable them;
-define('LG_BLOCK_NETWORK', !isset($_ENV['DISABLE_BLOCK_NETWORK']));
-define('LG_BLOCK_LOOKINGGLASS', !isset($_ENV['DISABLE_BLOCK_LOOKINGGLASS']));
-define('LG_BLOCK_SPEEDTEST', !isset($_ENV['DISABLE_BLOCK_SPEEDTEST']));
+define('LG_BLOCK_NETWORK', !getenv('DISABLE_BLOCK_NETWORK'));
+define('LG_BLOCK_LOOKINGGLASS', !getenv('DISABLE_BLOCK_LOOKINGGLASS'));
+define('LG_BLOCK_SPEEDTEST', !getenv('DISABLE_BLOCK_SPEEDTEST'));
 // This enables the custom block, which you can use to add something custom to the LG;
-define('LG_BLOCK_CUSTOM', isset($_ENV['ENABLE_CUSTOM_BLOCK']));
+define('LG_BLOCK_CUSTOM', getenv('ENABLE_CUSTOM_BLOCK'));
 
 // Define a file here which will be used to display the custom block, can be PHP too which outputs HTML;
 const LG_CUSTOM_HTML = __DIR__.'/custom.html.php';