Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎅🎄🎁 #942

Merged
merged 27 commits into from
Dec 25, 2022
Merged

🎅🎄🎁 #942

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a35216f
Add Docker Compose Override File for Multi PHP versions
cytopia Dec 23, 2022
f2c0372
Update DNS server to latest version
cytopia Dec 23, 2022
d354d84
Update intranet and docker-compose
cytopia Dec 23, 2022
ee59885
Update CHANGELOG
cytopia Dec 23, 2022
2b4bf59
Add missing mariadb config directories
cytopia Dec 23, 2022
e3b7c2d
Adjust check-config.sh
cytopia Dec 23, 2022
6fa03e6
Fix env var names in docs
cytopia Dec 23, 2022
6b80453
Docs announce
cytopia Dec 23, 2022
e51f34c
Fix wrong link in docs
cytopia Dec 23, 2022
794bf0c
Atom no longer available
cytopia Dec 23, 2022
32c7bed
Fix magento install guide links
cytopia Dec 23, 2022
3b1c0b2
docs: fix bind links
cytopia Dec 23, 2022
0964c7b
Fix hostnames in CHANGELOG
cytopia Dec 24, 2022
0e3b963
Do not rely on external supervisord.conf for C&C web interface
cytopia Dec 24, 2022
55f0447
Add some colored output for logs in C&C
cytopia Dec 25, 2022
c64c455
Remove obsolete mounts from docker-compose
cytopia Dec 25, 2022
d5858da
Fix indentation
cytopia Dec 25, 2022
e60aa4e
Remove obsolete points from README
cytopia Dec 25, 2022
a560926
Removed obsolete supervisorctl config section
cytopia Dec 25, 2022
98f05d7
Updated UPDATING.md
cytopia Dec 25, 2022
dfda00d
Pinned HTTPD images
cytopia Dec 25, 2022
8b0788b
Add PHP version number to README files in cfg/ dir
cytopia Dec 25, 2022
200f6ce
Fix volume paths in php-multi compose files
cytopia Dec 25, 2022
ffba5d6
Remove obsolete mod/ directory
cytopia Dec 25, 2022
10571f7
Intranet: Show backend type on vhost page
cytopia Dec 25, 2022
025b45c
Fix IPv6 handling
cytopia Dec 25, 2022
3ffb360
Update check-config.sh
cytopia Dec 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update check-config.sh
  • Loading branch information
@cytopia
cytopia committed Dec 25, 2022
commit 3ffb360c51e941d730137b1d4f1abcb687bedf71
19 changes: 1 addition & 18 deletions check-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ fi


#--------------------------------------------------------------------------------------------------
# Ensure cfg/, mod/ and log/ directories exist
# Ensure cfg/ and log/ directories exist
#--------------------------------------------------------------------------------------------------
print_head_1 "Checking required Devilbox core directories exist"

Expand Down Expand Up @@ -464,21 +464,6 @@ if [ "${DIR_MISSING}" = "0" ]; then
log_ok "All PHP log/ sub directories are present"
fi

# /mod/php-fpm-VERSION
DIR_MISSING=0
while read -r php_version; do
if [ ! -d "mod/php-fpm-${php_version}" ]; then
log_err "Directory 'mod/php-fpm-${php_version}' is missing"
RET_CODE=$(( RET_CODE + 1))
DIR_MISSING=1
else
log_debug "Directory 'mod/php-fpm-${php_version}' is present"
fi
done < <(grep -E '^#?PHP_SERVER=' env-example | awk -F'=' '{print $2}')
if [ "${DIR_MISSING}" = "0" ]; then
log_ok "All PHP mod/ sub directories are present"
fi

# /cfg/apache|nginx-VERSION
DIR_MISSING=0
while read -r httpd_version; do
Expand Down Expand Up @@ -522,7 +507,6 @@ DEVILBOX_DIRS=(
"cfg"
"compose"
"log"
"mod"
"supervisor"
)

Expand Down Expand Up @@ -591,7 +575,6 @@ DEVILBOX_DIRS=(
"ca"
"cfg"
"compose"
"mod"
"supervisor"
)

Expand Down