updating config-file xml's; prepare config-details view via ajax for config-commands/files to show in configuration

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-04-23 19:42:23 +02:00
parent 91d41af44a
commit 000cb93def
15 changed files with 121 additions and 9459 deletions

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<froxlor>
<distribution name="Ubuntu" codename="Bionic"
version="18.04" defaulteditor="/bin/nano">
version="18.04" defaulteditor="/bin/nano" deprecated="true">
<services>
<!-- HTTP -->
<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -4557,7 +4557,7 @@ UPLOADGID=
</daemon>
<!-- libnss-extrausers -->
<daemon name="libnssextrausers"
title="libnss-extrausers (required for FCGID/php-fpm/mpm-itk)">
title="libnss-extrausers">
<install><![CDATA[apt-get install libnss-extrausers]]></install>
<commands index="1">
<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
@@ -4618,7 +4618,7 @@ aliases: files
</file>
</daemon>
<!-- FCGID -->
<daemon name="fcgid" title="FCGID (alternative to mod_php)">
<daemon name="fcgid" title="FCGID">
<install><![CDATA[apt-get install apache2-suexec-pristine libapache2-mod-fcgid php-cgi]]></install>
<command><![CDATA[a2enmod suexec fcgid]]></command>
<commands index="1">
@@ -4636,7 +4636,7 @@ aliases: files
</daemon>
<!-- PHP-FPM -->
<daemon name="php-fpm"
title="PHP-FPM (alternative to mod_php)">
title="PHP-FPM">
<install>
<visibility mode="equals" value="apache2">{{settings.system.webserver}}
</visibility>

View File

@@ -2,11 +2,6 @@
<froxlor>
<distribution name="Debian" codename="Bullseye"
version="11.x" defaulteditor="/bin/nano">
<!-- OS defaults to be loaded on installation -->
<defaults>
<default settinggroup="system" varname="nssextrausers" value="1"></default>
<default settinggroup="system" varname="use_mod_proxy" value="1"></default>
</defaults>
<services>
<!-- HTTP -->
<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -4773,7 +4768,7 @@ UPLOADGID=
</daemon>
<!-- libnss-extrausers -->
<daemon name="libnssextrausers"
title="libnss-extrausers (required for FCGID/php-fpm/mpm-itk)">
title="libnss-extrausers">
<install><![CDATA[apt-get install libnss-extrausers]]></install>
<commands index="1">
<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
@@ -4834,7 +4829,7 @@ aliases: files
</file>
</daemon>
<!-- FCGID -->
<daemon name="fcgid" title="FCGID (alternative to mod_php)">
<daemon name="fcgid" title="FCGID">
<install><![CDATA[apt-get install apache2-suexec-pristine libapache2-mod-fcgid php-cgi]]></install>
<command><![CDATA[a2enmod suexec fcgid]]></command>
<commands index="1">
@@ -4852,7 +4847,7 @@ aliases: files
</daemon>
<!-- PHP-FPM -->
<daemon name="php-fpm"
title="PHP-FPM (alternative to mod_php)">
title="PHP-FPM">
<install>
<visibility mode="equals" value="apache2">{{settings.system.webserver}}
</visibility>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<froxlor>
<distribution name="Debian" codename="Buster"
version="10.x" defaulteditor="/bin/nano">
version="10.x" defaulteditor="/bin/nano" deprecated="true">
<services>
<!-- HTTP -->
<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -4759,7 +4759,7 @@ UPLOADGID=
</daemon>
<!-- libnss-extrausers -->
<daemon name="libnssextrausers"
title="libnss-extrausers (required for FCGID/php-fpm/mpm-itk)">
title="libnss-extrausers">
<install><![CDATA[apt-get install libnss-extrausers]]></install>
<commands index="1">
<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
@@ -4820,7 +4820,7 @@ aliases: files
</file>
</daemon>
<!-- FCGID -->
<daemon name="fcgid" title="FCGID (alternative to mod_php)">
<daemon name="fcgid" title="FCGID">
<install><![CDATA[apt-get install apache2-suexec-pristine libapache2-mod-fcgid php-cgi]]></install>
<command><![CDATA[a2enmod suexec fcgid]]></command>
<commands index="1">
@@ -4838,7 +4838,7 @@ aliases: files
</daemon>
<!-- PHP-FPM -->
<daemon name="php-fpm"
title="PHP-FPM (alternative to mod_php)">
title="PHP-FPM">
<install>
<visibility mode="equals" value="apache2">{{settings.system.webserver}}
</visibility>

View File

@@ -2,38 +2,16 @@
<froxlor>
<distribution name="CentOS" version="7"
defaulteditor="/usr/bin/nano">
<defaults>
<property>
<varname>apacheconf_vhost</varname>
<settinggroup>system</settinggroup>
<value>/etc/httpd/conf.d/</value>
</property>
<property>
<varname>apacheconf_diroptions</varname>
<settinggroup>system</settinggroup>
<value>/etc/httpd/conf.d/</value>
</property>
<property>
<varname>apacheconf_htpasswddir</varname>
<settinggroup>system</settinggroup>
<value>/etc/httpd/froxlor-htpasswd/</value>
</property>
<property>
<varname>apachereload_command</varname>
<settinggroup>system</settinggroup>
<value>systemctl reload-or-restart httpd.service</value>
</property>
<property>
<varname>bindreload_command</varname>
<settinggroup>system</settinggroup>
<value>systemctl reload-or-restart named.service</value>
</property>
<property>
<varname>crondreload</varname>
<settinggroup>system</settinggroup>
<value>systemctl reload-or-restart crond.service</value>
</property>
</defaults>
<!-- OS defaults to be loaded on installation -->
<defaults>
<default settinggroup="system" varname="nssextrausers" value="0"></default>
<default settinggroup="system" varname="apacheconf_vhost" value="/etc/httpd/conf.d/"></default>
<default settinggroup="system" varname="apacheconf_diroptions" value="/etc/httpd/conf.d/"></default>
<default settinggroup="system" varname="apacheconf_htpasswddir" value="/etc/httpd/froxlor-htpasswd/"></default>
<default settinggroup="system" varname="apachereload_command" value="systemctl reload-or-restart httpd.service"></default>
<default settinggroup="system" varname="bindreload_command" value="systemctl reload-or-restart named.service"></default>
<default settinggroup="system" varname="crondreload" value="systemctl reload-or-restart crond.service"></default>
</defaults>
<services>
<!-- HTTP -->
<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -2351,7 +2329,7 @@ ControlsLog /var/log/proftpd/controls.log
</daemon>
<!-- libnss-mysql -->
<daemon name="libnss"
title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
title="libnss-mysql">
<install><![CDATA[yum --enablerepo=extras install epel-release]]></install>
<install><![CDATA[yum install libnss-mysql nscd]]></install>
<file name="/etc/libnss-mysql.cfg" chown="root:root"

View File

@@ -2,38 +2,16 @@
<froxlor>
<distribution name="CentOS" version="8"
defaulteditor="/usr/bin/nano">
<defaults>
<property>
<varname>apacheconf_vhost</varname>
<settinggroup>system</settinggroup>
<value>/etc/httpd/conf.d/</value>
</property>
<property>
<varname>apacheconf_diroptions</varname>
<settinggroup>system</settinggroup>
<value>/etc/httpd/conf.d/</value>
</property>
<property>
<varname>apacheconf_htpasswddir</varname>
<settinggroup>system</settinggroup>
<value>/etc/httpd/froxlor-htpasswd/</value>
</property>
<property>
<varname>apachereload_command</varname>
<settinggroup>system</settinggroup>
<value>systemctl reload-or-restart httpd.service</value>
</property>
<property>
<varname>bindreload_command</varname>
<settinggroup>system</settinggroup>
<value>systemctl reload-or-restart named.service</value>
</property>
<property>
<varname>crondreload</varname>
<settinggroup>system</settinggroup>
<value>systemctl reload-or-restart crond.service</value>
</property>
</defaults>
<!-- OS defaults to be loaded on installation -->
<defaults>
<default settinggroup="system" varname="nssextrausers" value="0"></default>
<default settinggroup="system" varname="apacheconf_vhost" value="/etc/httpd/conf.d/"></default>
<default settinggroup="system" varname="apacheconf_diroptions" value="/etc/httpd/conf.d/"></default>
<default settinggroup="system" varname="apacheconf_htpasswddir" value="/etc/httpd/froxlor-htpasswd/"></default>
<default settinggroup="system" varname="apachereload_command" value="systemctl reload-or-restart httpd.service"></default>
<default settinggroup="system" varname="bindreload_command" value="systemctl reload-or-restart named.service"></default>
<default settinggroup="system" varname="crondreload" value="systemctl reload-or-restart crond.service"></default>
</defaults>
<services>
<!-- HTTP -->
<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -2354,7 +2332,7 @@ ControlsLog /var/log/proftpd/controls.log
</daemon>
<!-- libnss-mysql -->
<daemon name="libnss"
title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
title="libnss-mysql">
<install><![CDATA[dnf --enablerepo=extras install epel-release]]></install>
<install><![CDATA[dnf install libnss-mysql nscd]]></install>
<file name="/etc/libnss-mysql.cfg" chown="root:root"

View File

@@ -3973,7 +3973,7 @@ UPLOADGID=
</daemon>
<!-- libnss-extrausers -->
<daemon name="libnssextrausers"
title="libnss-extrausers (required for FCGID/php-fpm/mpm-itk)">
title="libnss-extrausers">
<install><![CDATA[apt-get install libnss-extrausers]]></install>
<commands index="1">
<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
@@ -4042,7 +4042,7 @@ aliases: files
</file>
</daemon>
<!-- FCGID -->
<daemon name="fcgid" title="FCGID (alternative to mod_php)">
<daemon name="fcgid" title="FCGID">
<install><![CDATA[apt-get install apache2-suexec-pristine libapache2-mod-fcgid php-cgi]]></install>
<command><![CDATA[a2enmod suexec fcgid]]></command>
<commands index="1">
@@ -4060,7 +4060,7 @@ aliases: files
</daemon>
<!-- PHP-FPM -->
<daemon name="php-fpm"
title="PHP-FPM (alternative to mod_php)">
title="PHP-FPM">
<install>
<visibility mode="equals" value="apache2">{{settings.system.webserver}}
</visibility>

View File

@@ -2,6 +2,10 @@
<froxlor>
<distribution name="Gentoo" version="2.2"
defaulteditor="/usr/bin/nano">
<!-- OS defaults to be loaded on installation -->
<defaults>
<default settinggroup="system" varname="nssextrausers" value="0"></default>
</defaults>
<services>
<!-- HTTP -->
<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -3673,7 +3677,7 @@ account required pam_mysql.so user=<SQL_UNPRIVILEGED_USER> passwd=<SQL_UN
</daemon>
<!-- libnss-mysql -->
<daemon name="libnss"
title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
title="libnss-mysql">
<install><![CDATA[emerge sys-auth/libnss-mysql]]></install>
<file name="/etc/libnss-mysql.cfg" chown="root:root"
chmod="0600" backup="true">
@@ -3795,7 +3799,7 @@ aliases: files
</file>
</daemon>
<!-- FCGID -->
<daemon name="fcgid" title="FCGID (alternative to mod_php)">
<daemon name="fcgid" title="FCGID">
<command><![CDATA[echo "dev-lang/php cgi" >> /etc/portage/package.use]]></command>
<install><![CDATA[emerge dev-lang/php sys-auth/libnss-mysql]]></install>
<commands index="1">
@@ -3832,7 +3836,7 @@ aliases: files
</daemon>
<!-- PHP-FPM -->
<daemon name="php-fpm"
title="PHP-FPM (alternative to mod_php)">
title="PHP-FPM">
<command><![CDATA[echo "dev-lang/php fpm" >> /etc/portage/package.use]]></command>
<install><![CDATA[emerge dev-lang/php sys-auth/libnss-mysql]]></install>
<commands index="1">

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff