Skip to content

Commit e6dca96

Browse files
committed
Move apache hestia (mod_status) config to mods-available from mods-enabled
1 parent 19946b6 commit e6dca96

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

install/hst-install-debian.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,8 @@ if [ "$apache" = 'yes' ]; then
11971197

11981198
# Copy configuration files
11991199
cp -f $HESTIA_INSTALL_DIR/apache2/apache2.conf /etc/apache2/
1200-
cp -f $HESTIA_INSTALL_DIR/apache2/status.conf /etc/apache2/mods-enabled/
1200+
cp -f $HESTIA_INSTALL_DIR/apache2/status.conf /etc/apache2/mods-available/hestia-status.conf
1201+
cp -f /etc/apache2/mods-available/status.load /etc/apache2/mods-available/hestia-status.load
12011202
cp -f $HESTIA_INSTALL_DIR/apache2/hestia-event.conf /etc/apache2/conf-available/
12021203
cp -f $HESTIA_INSTALL_DIR/logrotate/apache2 /etc/logrotate.d/
12031204

@@ -1207,6 +1208,8 @@ if [ "$apache" = 'yes' ]; then
12071208
a2enmod ssl > /dev/null 2>&1
12081209
a2enmod actions > /dev/null 2>&1
12091210
a2enconf --quiet hestia-event
1211+
a2dismod --quiet status > /dev/null 2>&1
1212+
a2enmod --quiet hestia-status
12101213

12111214
if [ "$phpfpm" = 'yes' ]; then
12121215
# Disable prefork and php, enable event

install/hst-install-ubuntu.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,8 @@ if [ "$apache" = 'yes' ]; then
11891189

11901190
# Copy configuration files
11911191
cp -f $HESTIA_INSTALL_DIR/apache2/apache2.conf /etc/apache2/
1192-
cp -f $HESTIA_INSTALL_DIR/apache2/status.conf /etc/apache2/mods-enabled/
1192+
cp -f $HESTIA_INSTALL_DIR/apache2/status.conf /etc/apache2/mods-available/hestia-status.conf
1193+
cp -f /etc/apache2/mods-available/status.load /etc/apache2/mods-available/hestia-status.load
11931194
cp -f $HESTIA_INSTALL_DIR/apache2/hestia-event.conf /etc/apache2/conf-available/
11941195
cp -f $HESTIA_INSTALL_DIR/logrotate/apache2 /etc/logrotate.d/
11951196

@@ -1199,6 +1200,8 @@ if [ "$apache" = 'yes' ]; then
11991200
a2enmod ssl > /dev/null 2>&1
12001201
a2enmod actions > /dev/null 2>&1
12011202
a2enconf --quiet hestia-event
1203+
a2dismod --quiet status > /dev/null 2>&1
1204+
a2enmod --quiet hestia-status
12021205

12031206
# Enable mod_ruid/mpm_itk or mpm_event
12041207
if [ "$phpfpm" = 'yes' ]; then

install/upgrade/versions/latest.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,13 @@ if [ "$WEB_SYSTEM" = "apache2" ]; then
7979
rm --force /etc/apache2/mods-enabled/hestia-event.conf # cleanup
8080
a2enconf --quiet hestia-event
8181
fi
82+
83+
# Move apache mod_status config to /mods-available and rename it to prevent losing changes on upgrade
84+
cp -f $HESTIA_INSTALL_DIR/apache2/status.conf /etc/apache2/mods-available/hestia-status.conf
85+
cp -f /etc/apache2/mods-available/status.load /etc/apache2/mods-available/hestia-status.load
86+
a2dismod --quiet status > /dev/null 2>&1
87+
a2enmod --quiet hestia-status
88+
rm --force /etc/apache2/mods-enabled/status.conf # a2dismod will not remove the file if it isn't a symlink
8289
fi
8390

8491
# Install Filegator FileManager during upgrade

0 commit comments

Comments
 (0)