From 8e7069f8932d44c2d8fe8483c1ca9c7eb910a4f8 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 22 Nov 2020 10:56:08 +0100 Subject: [PATCH] Fixes #692 Add custom supervisor configs --- .devilbox/www/htdocs/config_php.php | 126 ++++++++++++++++++++++++++++ .devilbox/www/include/lib/Html.php | 9 ++ .gitignore | 3 + docker-compose.yml | 5 +- supervisor/.keepme | 0 5 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 .devilbox/www/htdocs/config_php.php create mode 100644 supervisor/.keepme diff --git a/.devilbox/www/htdocs/config_php.php b/.devilbox/www/htdocs/config_php.php new file mode 100644 index 00000000..5d2fba8c --- /dev/null +++ b/.devilbox/www/htdocs/config_php.php @@ -0,0 +1,126 @@ + +authPage(); ?> + + + + getHead(); ?> + + + + getNavbar(); ?> + +
+ +

PHP custom configs

+
+
+

Shows your currently custom configuration files applied to the PHP-FPM container.

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SectionHostContainerFiles
Supervisordsupervisor//etc/supervisor/custom.d/ + '.basename($file). '
'; + } + } else { + echo 'No custom files'; + } + ?> +
Autostart (global)autostart//startup.2.d/ + '.basename($file). '
'; + } + } else { + echo 'No custom files'; + } + ?> +
Autostart (version)cfg/php-startup-//startup.1.d/ + '.basename($file). '
'; + } + } else { + echo 'No custom files'; + } + ?> +
PHP-FPMcfg/php-fpm-//etc/php-fpm-custom.d/ + '.basename($file). '
'; + } + } else { + echo 'No custom files'; + } + ?> +
PHPcfg/php-ini-//etc/php-custom.d/ + '.basename($file). '
'; + } + } else { + echo 'No custom files'; + } + ?> +
+
+
+ + +
+ + getFooter(); ?> + + diff --git a/.devilbox/www/include/lib/Html.php b/.devilbox/www/include/lib/Html.php index a0472212..75e68230 100644 --- a/.devilbox/www/include/lib/Html.php +++ b/.devilbox/www/include/lib/Html.php @@ -23,6 +23,15 @@ class Html 'path' => '/mail.php' ) ), + array( + 'name' => 'Configs', + 'menu' => array( + array( + 'name' => 'PHP', + 'path' => '/config_php.php' + ), + ), + ), array( 'name' => 'Databases', 'menu' => array( diff --git a/.gitignore b/.gitignore index a7c1eafb..5725f68d 100644 --- a/.gitignore +++ b/.gitignore @@ -137,6 +137,9 @@ /mod/php-fpm-8.0/*.so /mod/php-fpm-8.1/*.so +# Ignore supervisord configs +/supervisor/*.conf + # Ignore custom bash and other confi files /bash/* !/bash/bashrc.sh-example diff --git a/docker-compose.yml b/docker-compose.yml index a081e7cf..5f7f89a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER}-work-0.116 + image: devilbox/php-fpm:${PHP_SERVER}-work-0.117 hostname: php ## @@ -204,6 +204,9 @@ services: # Mount devilbox user-defined bash config - ${DEVILBOX_PATH}/bash:/etc/bashrc-devilbox.d:rw${MOUNT_OPTIONS} + # Mount devilbox user-defined supervisord config + - ${DEVILBOX_PATH}/supervisor:/etc/supervisor/custom.d:rw${MOUNT_OPTIONS} + # Certificate Authority public key - ${DEVILBOX_PATH}/ca:/ca:rw${MOUNT_OPTIONS} diff --git a/supervisor/.keepme b/supervisor/.keepme new file mode 100644 index 00000000..e69de29b