config.sh (fogproject-1.5.5) | : | config.sh (fogproject-1.5.6) | ||
---|---|---|---|---|
skipping to change at line 19 | skipping to change at line 19 | |||
# any later version. | # any later version. | |||
# | # | |||
# This program is distributed in the hope that it will be useful, | # This program is distributed in the hope that it will be useful, | |||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | # but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
# GNU General Public License for more details. | # GNU General Public License for more details. | |||
# | # | |||
# You should have received a copy of the GNU General Public License | # You should have received a copy of the GNU General Public License | |||
# along with this program. If not, see <http://www.gnu.org/licenses/>. | # along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
# | # | |||
command -v dnf | ||||
[[ $? -eq 0 ]] && repos="remi" || { | ||||
[[ -z $repos ]] && repos="remi,remi-php56,epel" | ||||
} | ||||
#[[ ! -d /run/rpcbind ]] && mkdir /run/rpcbind | #[[ ! -d /run/rpcbind ]] && mkdir /run/rpcbind | |||
#[[ ! -f /run/rpcbind/rpcbind.lock ]] && touch /run/rpcbind/rpcbind.lock | #[[ ! -f /run/rpcbind/rpcbind.lock ]] && touch /run/rpcbind/rpcbind.lock | |||
[[ -z $packageQuery ]] && packageQuery="rpm -q \$x" | [[ -z $packageQuery ]] && packageQuery="rpm -q \$x" | |||
case $linuxReleaseName in | case $linuxReleaseName in | |||
*[Mm][Aa][Gg][Ee][Ii][Aa]*) | *[Mm][Aa][Gg][Ee][Ii][Aa]*) | |||
[[ -z $packages ]] && packages="apache apache-mod_fcgid apache-mod_php a pache-mod_ssl cdrkit-genisoimage curl dhcp-server gcc gcc-c++ gzip htmldoc lftp liblzma-devel m4 make mariadb mariadb-common mariadb-common-core mariadb-core ne t-tools nfs-utils perl perl-Crypt-PasswdMD5 php-cli php-fpm php-gd php-gettext p hp-ldap php-mbstring php-mysqlnd php-pcntl php-pdo php-pdo_mysql tar tftp-server vsftpd wget xinetd" | [[ -z $packages ]] && packages="apache apache-mod_fcgid apache-mod_php a pache-mod_ssl cdrkit-genisoimage curl dhcp-server gcc gcc-c++ gzip htmldoc lftp m4 make mariadb mariadb-common mariadb-common-core mariadb-core net-tools nfs-ut ils perl perl-Crypt-PasswdMD5 php-cli php-curl php-fpm php-gd php-gettext php-ld ap php-mbstring php-mysqlnd php-pcntl php-pdo php-pdo_mysql tar tftp-server vsft pd wget xinetd" | |||
[[ -z $packageinstaller ]] && packageinstaller="urpmi --auto" | [[ -z $packageinstaller ]] && packageinstaller="urpmi --auto" | |||
[[ -z $packagelist ]] && packagelist="urpmq" | [[ -z $packagelist ]] && packagelist="urpmq" | |||
[[ -z $packageupdater ]] && packageupdater="$packageinstaller" | [[ -z $packageupdater ]] && packageupdater="$packageinstaller" | |||
[[ -z $packmanUpdate ]] && packmanUpdate="urpmi.update -a" | [[ -z $packmanUpdate ]] && packmanUpdate="urpmi.update -a" | |||
[[ -z $dhcpname ]] && dhcpname="dhcp-server" | [[ -z $dhcpname ]] && dhcpname="dhcp-server" | |||
[[ -z $tftpdirdst ]] && tftpdirdst="/var/lib/tftpboot" | [[ -z $tftpdirdst ]] && tftpdirdst="/var/lib/tftpboot" | |||
[[ -z $nfsexportsopts ]] && nfsexportsopts="no_subtree_check" | [[ -z $nfsexportsopts ]] && nfsexportsopts="no_subtree_check" | |||
[[ -z $etcconf ]] && etcconf="/etc/httpd/conf/conf.d/fog.conf" | [[ -z $etcconf ]] && etcconf="/etc/httpd/conf/conf.d/fog.conf" | |||
;; | ;; | |||
*) | *) | |||
[[ -z $etcconf ]] && etcconf="/etc/httpd/conf.d/fog.conf" | [[ -z $etcconf ]] && etcconf="/etc/httpd/conf.d/fog.conf" | |||
[[ -z $packages ]] && packages="curl dhcp gcc gcc-c++ genisoimage gzip h ttpd lftp m4 make mod_fastcgi mod_ssl mtools mysql mysql-server net-tools nfs-ut ils php php-cli php-common php-fpm php-gd php-ldap php-mbstring php-mysqlnd php- process syslinux tar tftp-server vsftpd wget xinetd xz-devel" | [[ -z $packages ]] && packages="curl dhcp gcc gcc-c++ genisoimage gzip h ttpd lftp m4 make mod_fastcgi mod_ssl mtools mysql mysql-server net-tools nfs-ut ils php php-cli php-common php-fpm php-gd php-ldap php-mbstring php-mysqlnd php- process syslinux tar tftp-server vsftpd wget xinetd xz-devel" | |||
command -v dnf >>$workingdir/error_logs/fog_error_${version}.log 2>&1 | command -v dnf >>$workingdir/error_logs/fog_error_${version}.log 2>&1 | |||
if [[ $? -eq 0 ]]; then | if [[ $? -eq 0 ]]; then | |||
[[ -z $packageinstaller ]] && packageinstaller="dnf -y --enablerepo= | [[ -z $packageinstaller ]] && packageinstaller="dnf -y install" | |||
$repos install" | [[ -z $packagelist ]] && packagelist="dnf list" | |||
[[ -z $packagelist ]] && packagelist="dnf list --enablerepo=$repos" | [[ -z $packageupdater ]] && packageupdater="dnf -y update" | |||
[[ -z $packageupdater ]] && packageupdater="dnf -y --enablerepo=$rep | [[ -z $packageUpdate ]] && packmanUpdate="dnf check-update" | |||
os update" | ||||
[[ -z $packageUpdate ]] && packmanUpdate="dnf --enablerepo=$repos ch | ||||
eck-update" | ||||
[[ -z $repoenable ]] && repoenable="dnf config-manager --set-enabled " | [[ -z $repoenable ]] && repoenable="dnf config-manager --set-enabled " | |||
else | else | |||
[[ -z $packageinstaller ]] && packageinstaller="yum -y --enablerepo= | [[ -z $packageinstaller ]] && packageinstaller="yum -y install" | |||
$repos install" | [[ -z $packagelist ]] && packagelist="yum list" | |||
[[ -z $packagelist ]] && packagelist="yum --enablerepo=$repos list" | [[ -z $packageupdater ]] && packageupdater="yum -y update" | |||
[[ -z $packageupdater ]] && packageupdater="yum -y --enablerepo=$rep | [[ -z $packmanUpdate ]] && packmanUpdate="yum -y check-update" | |||
os update" | ||||
[[ -z $packmanUpdate ]] && packmanUpdate="yum -y --enablerepo=$repos | ||||
check-update" | ||||
pkginst=$(command -v dnf) | ||||
[[ -z $pkginst ]] && pkginst=$(command -v yum) | ||||
command -v yum-config-manager >/dev/null 2>&1 | command -v yum-config-manager >/dev/null 2>&1 | |||
[[ ! $? -eq 0 ]] && $pkginst yum-utils >/dev/null 2>&1 | [[ ! $? -eq 0 ]] && $packageinstaller yum-utils >/dev/null 2>&1 | |||
[[ -z $repoenable ]] && repoenable="yum-config-manager --enable" | [[ -z $repoenable ]] && repoenable="yum-config-manager --enable" | |||
fi | fi | |||
[[ -z $dhcpname ]] && dhcpname="dhcp" | [[ -z $dhcpname ]] && dhcpname="dhcp" | |||
;; | ;; | |||
esac | esac | |||
[[ -z $langPackages ]] && langPackages="iso-codes" | [[ -z $langPackages ]] && langPackages="iso-codes" | |||
if [[ -z $webdirdest ]]; then | if [[ -z $webdirdest ]]; then | |||
if [[ -z $docroot ]]; then | if [[ -z $docroot ]]; then | |||
docroot="/var/www/html/" | docroot="/var/www/html/" | |||
webdirdest="${docroot}fog/" | webdirdest="${docroot}fog/" | |||
End of changes. 5 change blocks. | ||||
22 lines changed or deleted | 10 lines changed or added |