Merge branch 'main' into feature/user-roles

Author: Kristan Kenney

bin/v-change-sys-hostname

@@ -51,6 +51,11 @@ else
     # Debian/Ubuntu
     hostnamectl set-hostname $domain
     echo "$domain" > /etc/hostname
+
+    # Update Roundcube password plugin configuration
+    if [ -d /etc/roundcube/ ]; then
+        sed -i "/password_hestia_host/c\$rcmail_config['password_hestia_host'] = '$domain';" /etc/roundcube/plugins/password/config.inc.php
+    fi
 fi
 
 # Update ip helo for exim

func/domain.sh

@@ -248,7 +248,7 @@ add_web_config() {
             -e "s|%proxy_system%|$PROXY_SYSTEM|g" \
             -e "s|%proxy_port%|$PROXY_PORT|g" \
             -e "s|%proxy_ssl_port%|$PROXY_SSL_PORT|g" \
-            -e "s/%proxy_extentions%/${PROXY_EXT//,/|}/g" \
+            -e "s/%proxy_extensions%/${PROXY_EXT//,/|}/g" \
             -e "s|%user%|$user|g" \
             -e "s|%group%|$user|g" \
             -e "s|%home%|$HOMEDIR|g" \
@@ -764,7 +764,7 @@ add_webmail_config() {
             -e "s|%proxy_system%|$PROXY_SYSTEM|g" \
             -e "s|%proxy_port%|$PROXY_PORT|g" \
             -e "s|%proxy_ssl_port%|$PROXY_SSL_PORT|g" \
-            -e "s/%proxy_extentions%/${PROXY_EXT//,/|}/g" \
+            -e "s/%proxy_extensions%/${PROXY_EXT//,/|}/g" \
             -e "s|%user%|$user|g" \
             -e "s|%group%|$user|g" \
             -e "s|%home%|$HOMEDIR|g" \

install/deb/templates/web/nginx/caching.stpl

@@ -24,7 +24,7 @@ server {
         proxy_cache_bypass $no_cache;
         proxy_cache_bypass $cookie_session $http_x_update;
 
-        location ~* ^.+\.(%proxy_extentions%)$ {
+        location ~* ^.+\.(%proxy_extensions%)$ {
             proxy_cache    off;
             root           %sdocroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;

install/deb/templates/web/nginx/caching.tpl

@@ -19,7 +19,7 @@ server {
         proxy_cache_bypass $no_cache;
         proxy_cache_bypass $cookie_session $http_x_update;
 
-        location ~* ^.+\.(%proxy_extentions%)$ {
+        location ~* ^.+\.(%proxy_extensions%)$ {
             proxy_cache    off;
             root           %docroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;

install/deb/templates/web/nginx/default.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
         proxy_pass      https://%ip%:%web_ssl_port%;
-        location ~* ^.+\.(%proxy_extentions%)$ {
+        location ~* ^.+\.(%proxy_extensions%)$ {
             root           %sdocroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;
             access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;

install/deb/templates/web/nginx/default.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
-        location ~* ^.+\.(%proxy_extentions%)$ {
+        location ~* ^.+\.(%proxy_extensions%)$ {
             root           %docroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;
             access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;

install/deb/templates/web/nginx/hosting.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
         proxy_pass      https://%ip%:%web_ssl_port%;
-        location ~* ^.+\.(%proxy_extentions%)$ {
+        location ~* ^.+\.(%proxy_extensions%)$ {
             root           %sdocroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;
             access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;

install/deb/templates/web/nginx/hosting.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
         proxy_pass      http://%ip%:%web_port%;
-        location ~* ^.+\.(%proxy_extentions%)$ {
+        location ~* ^.+\.(%proxy_extensions%)$ {
             root           %docroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;
             access_log     /var/log/%web_system%/domains/%domain%.bytes bytes;

install/rhel/templates/web/nginx/caching.stpl

@@ -19,7 +19,7 @@ server {
         proxy_cache_bypass $no_cache;
         proxy_cache_bypass $cookie_session $http_x_update;
 
-        location ~* ^.+\.(%proxy_extentions%)$ {
+        location ~* ^.+\.(%proxy_extensions%)$ {
             proxy_cache    off;
             root           %sdocroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;

install/rhel/templates/web/nginx/caching.tpl

@@ -14,7 +14,7 @@ server {
         proxy_cache_bypass $no_cache;
         proxy_cache_bypass $cookie_session $http_x_update;
 
-        location ~* ^.+\.(%proxy_extentions%)$ {
+        location ~* ^.+\.(%proxy_extensions%)$ {
             proxy_cache    off;
             root           %docroot%;
             access_log     /var/log/%web_system%/domains/%domain%.log combined;