"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/arch/config.sh" between
fogproject-1.5.5.tar.gz and fogproject-1.5.6.tar.gz

About: FOG is a Linux-based network computer cloning solution for Windows, Mac OSX and various Linux distributions that ties together a few open-source tools with a PHP-based web interface. FOG doesn’t use any boot disks, or CDs; everything is done via TFTP and PXE.

config.sh  (fogproject-1.5.5)	:	config.sh  (fogproject-1.5.6)
skipping to change at line 16		skipping to change at line 16
# 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/>.
#		#
[[ -z $packages ]] && packages="apache bc cdrtools curl dhcp gcc gzip lftp m4 ma ke mariadb mod_fastcgi net-tools nfs-utils openssh openssl perl perl-crypt-passw dmd5 php php-apache php-fpm php-gd syslinux tar tftp-hpa vsftpd wget xinetd xz"		[[ -z $packages ]] && packages="apache bc cdrtools curl dhcp gcc git gzip lftp m 4 make mariadb mod_fastcgi net-tools nfs-utils openssh openssl perl perl-crypt-p asswdmd5 php php-apache php-fpm php-gd syslinux tar tftp-hpa vsftpd wget xinetd xz"
[[ -z $packageinstaller ]] && packageinstaller="pacman -Sy --noconfirm"		[[ -z $packageinstaller ]] && packageinstaller="pacman -Sy --noconfirm"
[[ -z $packagelist ]] && packagelist="pacman -Si"		[[ -z $packagelist ]] && packagelist="pacman -Si"
[[ -z $packageupdater ]] && packageupdater="pacman -Syu --noconfirm"		[[ -z $packageupdater ]] && packageupdater="pacman -Syu --noconfirm"
[[ -z $packmanUpdate ]] && packmanUpdate="$packageinstaller"		[[ -z $packmanUpdate ]] && packmanUpdate="$packageinstaller"
[[ -z $packageQuery ]] && packageQuery="pacman -Q \$x"		[[ -z $packageQuery ]] && packageQuery="pacman -Q \$x"
[[ -z $langPackages ]] && langPackages="iso-codes"		[[ -z $langPackages ]] && langPackages="iso-codes"
[[ -z $dhcpname ]] && dhcpname="dhcp"		[[ -z $dhcpname ]] && dhcpname="dhcp"
if [[ -z $webdirdest ]]; then		if [[ -z $webdirdest ]]; then
if [[ -z $docroot ]]; then		if [[ -z $docroot ]]; then
docroot="/srv/http/"		docroot="/srv/http/"
skipping to change at line 39		skipping to change at line 39
webdirdest="${docroot}fog/"		webdirdest="${docroot}fog/"
else		else
webdirdest="${docroot}/"		webdirdest="${docroot}/"
fi		fi
fi		fi
[[ -z $webredirect ]] && webredirect="${webdirdest}/index.php"		[[ -z $webredirect ]] && webredirect="${webdirdest}/index.php"
[[ -z $apacheuser ]] && apacheuser="http"		[[ -z $apacheuser ]] && apacheuser="http"
[[ -z $apachelogdir ]] && apachelogdir="/var/log/httpd"		[[ -z $apachelogdir ]] && apachelogdir="/var/log/httpd"
[[ -z $apacheerrlog ]] && apacheerrlog="$apachelogdir/error_log"		[[ -z $apacheerrlog ]] && apacheerrlog="$apachelogdir/error_log"
[[ -z $apacheacclog ]] && apacheacclog="$apachelogdir/access_log"		[[ -z $apacheacclog ]] && apacheacclog="$apachelogdir/access_log"
		[[ -z $httpdconf ]] && httpdconf="/etc/httpd/conf/httpd.conf"
[[ -z $etcconf ]] && etcconf="/etc/httpd/conf/extra/fog.conf"		[[ -z $etcconf ]] && etcconf="/etc/httpd/conf/extra/fog.conf"
[[ -z $phpini ]] && phpini="/etc/php/php.ini"		[[ -z $phpini ]] && phpini="/etc/php/php.ini"
[[ -z $storageLocation ]] && storageLocation="/images"		[[ -z $storageLocation ]] && storageLocation="/images"
[[ -z $storageLocationCapture ]] && storageLocationCapture="${storageLocation}/d ev"		[[ -z $storageLocationCapture ]] && storageLocationCapture="${storageLocation}/d ev"
[[ -z $dhcpconfig ]] && dhcpconfig="/etc/dhcpd.conf"		[[ -z $dhcpconfig ]] && dhcpconfig="/etc/dhcpd.conf"
[[ -z $dhcpconfigother ]] && dhcpconfigother="/etc/dhcp/dhcpd.conf"		[[ -z $dhcpconfigother ]] && dhcpconfigother="/etc/dhcp/dhcpd.conf"
[[ -z $tftpdirdst ]] && tftpdirdst="/srv/tftp"		[[ -z $tftpdirdst ]] && tftpdirdst="/srv/tftp"
[[ -z $tftpconfig ]] && tftpconfig="/etc/xinetd.d/tftpd"		[[ -z $tftpconfig ]] && tftpconfig="/etc/xinetd.d/tftpd"
[[ -z $ftpxinetd ]] && ftpxinetd="/etc/xinetd.d/vsftpd"		[[ -z $ftpxinetd ]] && ftpxinetd="/etc/xinetd.d/vsftpd"
[[ -z $ftpconfig ]] && ftpconfig="/etc/vsftpd.conf"		[[ -z $ftpconfig ]] && ftpconfig="/etc/vsftpd.conf"
End of changes. 2 change blocks.
1 lines changed or deleted		2 lines changed or added

---