casjaysdevdocker/caddy
1
0
Fork 0
mirror of https://github.com/casjaysdevdocker/caddy synced 2025-01-18 12:34:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

🗃️ Committing everything that changed 🗃️

Browse Source
This commit is contained in:
casjay 2023-03-16 16:15:06 -04:00
parent cd28962404
commit 9e2576bf66
No known key found for this signature in database
GPG Key ID: 4F765975C1F0EE5F
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh
View File

@ -24,7 +24,7 @@ done
# execute command variables # execute command variables
WORKDIR="" # set working directory WORKDIR="" # set working directory
SERVICE_UID="0" # set the user id SERVICE_UID="0" # set the user id
SERVICE_USER="root" # execute command as another user SERVICE_USER="daemon" # execute command as another user
SERVICE_PORT="9000" # port which service is listening on SERVICE_PORT="9000" # port which service is listening on
EXEC_CMD_BIN="php-fpm" # command to execute EXEC_CMD_BIN="php-fpm" # command to execute
EXEC_CMD_ARGS="--allow-to-run-as-root --nodaemonize --fpm-config /etc/php/php-fpm.conf" # command arguments EXEC_CMD_ARGS="--allow-to-run-as-root --nodaemonize --fpm-config /etc/php/php-fpm.conf" # command arguments
@ -36,7 +36,7 @@ conf_dir="/config/php"
www_dir="${WWW_ROOT_DIR:-/data/htdocs}" www_dir="${WWW_ROOT_DIR:-/data/htdocs}"
etc_dir="${PHP_INI_DIR:-$(__find_php_ini)}" etc_dir="${PHP_INI_DIR:-$(__find_php_ini)}"
php_bin="${PHP_BIN_DIR:-$(__find_php_bin)}" php_bin="${PHP_BIN_DIR:-$(__find_php_bin)}"
php_user="${SERVICE_USER//root/daemon}" php_user="$SERVICE_USER"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# use this function to update config files - IE: change port # use this function to update config files - IE: change port
__update_conf_files() { __update_conf_files() {

14
rootfs/usr/local/etc/docker/init.d/zz-caddy.sh
View File

@ -23,13 +23,13 @@ done
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# execute command variables # execute command variables
WORKDIR="" # set working directory WORKDIR="" # set working directory
SERVICE_UID="0" # set the user id SERVICE_UID="0" # set the user id
SERVICE_USER="root" # execute command as another user SERVICE_USER="root" # execute command as another user
SERVICE_PORT="" # port which service is listening on SERVICE_PORT="" # port which service is listening on
EXEC_CMD_BIN="caddy" # command to execute EXEC_CMD_BIN="caddy" # command to execute
EXEC_CMD_ARGS="run --config /etc/caddy/Caddyfile --adapter caddyfile" # command arguments EXEC_CMD_ARGS="run --config /etc/caddy/Caddyfile" # command arguments
PRE_EXEC_MESSAGE="" # Show message before execute PRE_EXEC_MESSAGE="" # Show message before execute
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Other variables that are needed # Other variables that are needed
etc_dir="/etc/caddy" etc_dir="/etc/caddy"

2
rootfs/usr/local/share/template-files/data/htdocs/www/index.php
View File

@ -64,8 +64,6 @@
SERVER: SERVER:
<?php echo $_SERVER['SERVER_SOFTWARE']; ?> <br /> <?php echo $_SERVER['SERVER_SOFTWARE']; ?> <br />
SERVER Address:
<?php echo $_SERVER['SERVER_ADDR']; ?> <br />
</h2> </h2>
<br /><br /> <br /><br />