Merge branch 'stefanpejcic:main' into main

This commit is contained in:
DevBack 2024-12-12 10:55:08 +01:00 committed by GitHub
commit ee15384f3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 8 deletions

View File

@ -11,7 +11,7 @@
# Usage: bash <(curl -sSL https://openpanel.org) # Usage: bash <(curl -sSL https://openpanel.org)
# Author: Stefan Pejcic <stefan@pejcic.rs> # Author: Stefan Pejcic <stefan@pejcic.rs>
# Created: 11.07.2023 # Created: 11.07.2023
# Last Modified: 03.12.2024 # Last Modified: 11.12.2024
# #
################################################################################ ################################################################################
@ -1581,6 +1581,15 @@ setup_bind(){
ubuntu/bind9:latest \ ubuntu/bind9:latest \
-c 'rndc-confgen -a -A hmac-sha256 -b 256 -c /etc/bind/rndc.key' -c 'rndc-confgen -a -A hmac-sha256 -b 256 -c /etc/bind/rndc.key'
if [ $? -ne 0 ]; then
echo "Error: Generating rndc.key failed." | tee -a "$LOG_FILE"
if grep -q "Unable to find image 'ubuntu/bind9:latest' locally" "$LOG_FILE" &&
grep -q "dial tcp: lookup registry-1.docker.io" "$LOG_FILE"; then
radovan 1 "Failed to connect to Docker Registry on port 53 - try setting Google DNS nameservers as suggested in: https://github.com/stefanpejcic/OpenPanel/issues/294 and then retry the installation."
else
echo "Unknown error occurred. Please check the log for details." | tee -a "$LOG_FILE"
fi
# Check if the file exists # Check if the file exists
if [ -f "$RNDC_KEY_PATH" ]; then if [ -f "$RNDC_KEY_PATH" ]; then
: :
@ -1590,6 +1599,8 @@ setup_bind(){
RETRY_COUNT_RDNC=$((RETRY_COUNT_RDNC + 1)) RETRY_COUNT_RDNC=$((RETRY_COUNT_RDNC + 1))
sleep 2 sleep 2
fi
done done
if [ -f "$RNDC_KEY_PATH" ]; then if [ -f "$RNDC_KEY_PATH" ]; then
echo "rndc.key successfully generated." echo "rndc.key successfully generated."

View File

@ -273,6 +273,8 @@ run_custom_postupdate_script() {
download_new_admin() { download_new_admin() {
touch /etc/openpanel/openadmin/config/admin.ini
cd $OPENADMIN_DIR cd $OPENADMIN_DIR
git pull git pull

View File

@ -12,10 +12,14 @@ Not yet released.
- [Implement CSRF protection on all forms #272](https://github.com/stefanpejcic/OpenPanel/issues/272) - [Implement CSRF protection on all forms #272](https://github.com/stefanpejcic/OpenPanel/issues/272)
- Fixed bug displaying avatar type on 'OpenPanel > FileManager'. - Fixed bug displaying avatar type on 'OpenPanel > FileManager'.
- Fixed bug with translations for 'OpenPanel > SiteManager' on Flarum and WordPress templates. - Fixed bug with translations for 'OpenPanel > SiteManager' on Flarum and WordPress templates.
- Fixed bug renewing ssl using `opencli ssl-domain` command.
- [Docker Hub unreachable with Contabo custom nameservers #294](https://github.com/stefanpejcic/OpenPanel/issues/294)
### 💅 Polish ### 💅 Polish
- If ipv4 is not available on the server, new domains will instead use ipv6 in Nginx and Bind9 configuration files. [Full support for IPv6 only servers is in progress](https://github.com/stefanpejcic/OpenPanel/issues/296)
- Redesigned OpenAdmin Dashboard page. - Redesigned OpenAdmin Dashboard page.
- 'OpenAdmin > Users > singe user' will now display IPv6 address if set for the user.
- Suspending user will now redirect all their domains to custom [suspended_user.html](https://github.com/stefanpejcic/openpanel-configuration/blob/main/nginx/suspended_user.html) template. - Suspending user will now redirect all their domains to custom [suspended_user.html](https://github.com/stefanpejcic/openpanel-configuration/blob/main/nginx/suspended_user.html) template.
- OpenPanel can now be updated [directly from Github](/docs/admin/intro/#manual-updates). - OpenPanel can now be updated [directly from Github](/docs/admin/intro/#manual-updates).
- [`opencli domains-add` command](https://dev.openpanel.com/cli/domains.html#Add-Domain-to-User) will no longer allow users to add the server hostname as a domain. - [`opencli domains-add` command](https://dev.openpanel.com/cli/domains.html#Add-Domain-to-User) will no longer allow users to add the server hostname as a domain.