Replacing some references to live-helper with live-build in the cgi.
This commit is contained in:
Daniel Baumann
parent
e3d7dede0d
commit
d846bb0dec
16
cgi/Makefile
16
cgi/Makefile
|
|
@ -1,19 +1,19 @@
|
|||
# Makefile
|
||||
|
||||
install:
|
||||
install -D -m 0755 cgi $(DESTDIR)/usr/lib/cgi-bin/live-helper
|
||||
install -D -m 0755 cron $(DESTDIR)/etc/cron.d/live-helper.cgi
|
||||
install -D -m 0644 default $(DESTDIR)/etc/default/live-helper.cgi
|
||||
install -D -m 0644 logrotate $(DESTDIR)/etc/logrotate.d/live-helper.cgi
|
||||
install -D -m 0755 cgi $(DESTDIR)/usr/lib/cgi-bin/live-build
|
||||
install -D -m 0755 cron $(DESTDIR)/etc/cron.d/live-build.cgi
|
||||
install -D -m 0644 default $(DESTDIR)/etc/default/live-build.cgi
|
||||
install -D -m 0644 logrotate $(DESTDIR)/etc/logrotate.d/live-build.cgi
|
||||
|
||||
install -d -m 0755 $(DESTDIR)/var/log
|
||||
touch $(DESTDIR)/var/log/live
|
||||
chown www-data:www-data $(DESTDIR)/var/log/live
|
||||
|
||||
uninstall:
|
||||
rm -f $(DESTDIR)/usr/lib/cgi-bin/live-helper
|
||||
rm -f $(DESTDIR)/etc/cron.d/live-helper.cgi
|
||||
rm -f $(DESTDIR)/etc/default/live-helper.cgi
|
||||
rm -f $(DESTDIR)/etc/logrotate.d/live-helper.cgi
|
||||
rm -f $(DESTDIR)/usr/lib/cgi-bin/live-build
|
||||
rm -f $(DESTDIR)/etc/cron.d/live-build.cgi
|
||||
rm -f $(DESTDIR)/etc/default/live-build.cgi
|
||||
rm -f $(DESTDIR)/etc/logrotate.d/live-build.cgi
|
||||
|
||||
reinstall: uninstall install
|
||||
|
|
|
|||
12
cgi/cgi
12
cgi/cgi
|
|
@ -12,11 +12,11 @@
|
|||
. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
|
||||
|
||||
# Reading defaults
|
||||
if [ -r /etc/default/live-helper.cgi ]
|
||||
if [ -r /etc/default/live-build.cgi ]
|
||||
then
|
||||
. /etc/default/live-helper.cgi
|
||||
. /etc/default/live-build.cgi
|
||||
else
|
||||
echo "E: /etc/default/live-helper.cgi missing"
|
||||
echo "E: /etc/default/live-build.cgi missing"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -172,7 +172,7 @@ else
|
|||
|
||||
# Writing build file
|
||||
cat > "${_TEMPDIR}"/"${_BUILD}".build << EOF
|
||||
# live-helper.cgi "${VERSION}" build file
|
||||
# live-build.cgi "${VERSION}" build file
|
||||
# `date -R`
|
||||
|
||||
_BUILD="${_BUILD}"
|
||||
|
|
@ -228,8 +228,8 @@ _CUSTOM_BINARY="${_CUSTOM_BINARY}"
|
|||
LH_REPOSITORIES="${LH_REPOSITORIES}"
|
||||
EOF
|
||||
|
||||
echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-helper.cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live
|
||||
echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-helper.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LH_BINARY_IMAGES}|distribution ${LH_DISTRIBUTION}|packages_lists ${LH_PACKAGES_LISTS}|tasks ${LH_TASKS}|packages ${LH_PACKAGES}|architecture ${LH_ARCHITECTURE}|mirror_bootstrap_security ${LH_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LH_MIRROR_BOOTSTRAP}|mirror_binary_security ${LH_MIRROR_BINARY_SECURITY}|mirror_binary ${LH_MIRROR_BINARY}|archive_areas ${LH_ARCHIVE_AREAS}|chroot_filesystem ${LH_CHROOT_FILESYSTEM}|linux_flavours ${LH_LINUX_FLAVOURS}|security ${LH_SECURITY}|symlinks ${LH_SYMLINKS}|sysvinit ${LH_SYSVINIT}|binary_indices ${LH_BINARY_INDICES}|bootappend_install ${LH_BOOTAPPEND_INSTALL}|bootappend_live ${LH_BOOTAPPEND_LIVE}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|iso_application ${LH_ISO_APPLICATION}|iso_preparer ${LH_ISO_PREPARER}|iso_publisher ${LH_ISO_PUBLISHER}|iso_volume ${LH_ISO_VOLUME}|memtest ${LH_MEMTEST}|net_path ${LH_NET_ROOT_PATH}|net_server ${LH_NET_ROOT_SERVER}|source_images ${LH_SOURCE_IMAGES}|source ${LH_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}\n" >> /var/log/live
|
||||
echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-build.cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live
|
||||
echo "$(date +%b\ %d\ %H:%M:%S) ${HOSTNAME} live-build.cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LH_BINARY_IMAGES}|distribution ${LH_DISTRIBUTION}|packages_lists ${LH_PACKAGES_LISTS}|tasks ${LH_TASKS}|packages ${LH_PACKAGES}|architecture ${LH_ARCHITECTURE}|mirror_bootstrap_security ${LH_MIRROR_BOOTSTRAP}|mirror_bootstrap ${LH_MIRROR_BOOTSTRAP}|mirror_binary_security ${LH_MIRROR_BINARY_SECURITY}|mirror_binary ${LH_MIRROR_BINARY}|archive_areas ${LH_ARCHIVE_AREAS}|chroot_filesystem ${LH_CHROOT_FILESYSTEM}|linux_flavours ${LH_LINUX_FLAVOURS}|security ${LH_SECURITY}|symlinks ${LH_SYMLINKS}|sysvinit ${LH_SYSVINIT}|binary_indices ${LH_BINARY_INDICES}|bootappend_install ${LH_BOOTAPPEND_INSTALL}|bootappend_live ${LH_BOOTAPPEND_LIVE}|bootloader ${LH_BOOTLOADER}|debian_installer ${LH_DEBIAN_INSTALLER}|encryption ${LH_ENCRYPTION}|iso_application ${LH_ISO_APPLICATION}|iso_preparer ${LH_ISO_PREPARER}|iso_publisher ${LH_ISO_PUBLISHER}|iso_volume ${LH_ISO_VOLUME}|memtest ${LH_MEMTEST}|net_path ${LH_NET_ROOT_PATH}|net_server ${LH_NET_ROOT_SERVER}|source_images ${LH_SOURCE_IMAGES}|source ${LH_SOURCE}|custom_bootstrap ${_CUSTOM_BOOTSTRAP}|custom_binary ${_CUSTOM_BINARY}\n" >> /var/log/live
|
||||
fi
|
||||
|
||||
sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
|
||||
|
|
|
|||
22
cgi/cron
22
cgi/cron
|
|
@ -12,11 +12,11 @@
|
|||
. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
|
||||
|
||||
# Reading defaults
|
||||
if [ -r /etc/default/live-helper.cgi ]
|
||||
if [ -r /etc/default/live-build.cgi ]
|
||||
then
|
||||
. /etc/default/live-helper.cgi
|
||||
. /etc/default/live-build.cgi
|
||||
else
|
||||
echo "E: /etc/default/live-helper.cgi missing"
|
||||
echo "E: /etc/default/live-build.cgi missing"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -33,27 +33,27 @@ then
|
|||
fi
|
||||
|
||||
# Checking lock file
|
||||
if [ -f /var/lock/live-helper.cgi.lock ]
|
||||
if [ -f /var/lock/live-build.cgi.lock ]
|
||||
then
|
||||
echo "E: live-helper.cgi already/still running."
|
||||
echo "E: live-build.cgi already/still running."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Creating lock trap
|
||||
trap "test -f /var/lock/live-helper.cgi.lock && rm -f /var/lock/live-helper.cgi.lock; exit 0" 0 1 2 3 9 15
|
||||
trap "test -f /var/lock/live-build.cgi.lock && rm -f /var/lock/live-build.cgi.lock; exit 0" 0 1 2 3 9 15
|
||||
|
||||
# Creating lock file
|
||||
touch /var/lock/live-helper.cgi.lock
|
||||
touch /var/lock/live-build.cgi.lock
|
||||
|
||||
# Cleanup old builds: cron should be run at least once per hour to take effect
|
||||
if ls "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`* > /dev/null 2>&1
|
||||
then
|
||||
rm -rf "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`*
|
||||
|
||||
echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper.cgi: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live
|
||||
echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-build.cgi: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live
|
||||
fi
|
||||
|
||||
# Ok from here spin through the live-helper.cgi files we have waiting to build
|
||||
# Ok from here spin through the live-build.cgi files we have waiting to build
|
||||
#if ls "${_TEMPDIR}"/*.build > /dev/null 2>&1
|
||||
if Find_files ${_TEMPDIR}/*.build
|
||||
then
|
||||
|
|
@ -76,7 +76,7 @@ then
|
|||
_CUSTOM_BINARY=`awk -F\" '/^_CUSTOM_BINARY=/{print $2}' ${_FILE}`
|
||||
|
||||
# Drop out some build data for information if something goes wrong.
|
||||
echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper.cgi: begin web build (${_BUILD})." >> /var/log/live
|
||||
echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-build.cgi: begin web build (${_BUILD})." >> /var/log/live
|
||||
|
||||
# Creating build directory which also creates the config/chroot_sources folder
|
||||
mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/chroot_sources
|
||||
|
|
@ -187,6 +187,6 @@ EOF
|
|||
# Removing build directory
|
||||
rm -rf "${_TEMPDIR}"/"${_BUILD}"
|
||||
|
||||
echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper.cgi: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live
|
||||
echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-build.cgi: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live
|
||||
done
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Defaults for /etc/cron.daily/live-helper.cgi
|
||||
# Defaults for /etc/cron.daily/live-build.cgi
|
||||
|
||||
_WEBBUILD="disabled"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# /etc/logrotate.d/live-helper
|
||||
# /etc/logrotate.d/live-build
|
||||
|
||||
/var/log/live
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue