Merge branch 'master' of https://github.com/Swarmops/Swarmops
This commit is contained in:
@@ -137,13 +137,26 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -e "../templates/preinst-$PACKAGE.template" ]; then
|
||||
echo "Adding $PACKAGE preinst script..."
|
||||
cp ../templates/preinst-$PACKAGE.template DEBIAN/preinst
|
||||
chmod +x DEBIAN/preinst
|
||||
else
|
||||
if [ -e "DEBIAN/preinst" ]; then
|
||||
echo "Deleting old preinst script..."
|
||||
rm DEBIAN/preinst
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Converting CRLF line endings in scripts to LF-only..."
|
||||
dos2unix -q DEBIAN/*
|
||||
dos2unix -q etc/init.d/*
|
||||
|
||||
echo "Setting build number $BUILDID..."
|
||||
sed -i "s/--BuildNumber--/$BUILDID/" DEBIAN/control
|
||||
echo $BUILDID > $DEPLOYDIR/$TARGETDIR/BuildIdentity.txt
|
||||
sed -i "s/--BuildNumber--/$BUILDID/g" DEBIAN/control
|
||||
if [ -e $DEPLOYDIR/$TARGETDIR ]; then
|
||||
echo $BUILDID > $DEPLOYDIR/$TARGETDIR/BuildIdentity.txt
|
||||
fi
|
||||
|
||||
# Calculating new checksums
|
||||
echo "Creating MD5 checksum file..."
|
||||
|
||||
@@ -2,7 +2,7 @@ Package: swarmops-backend
|
||||
Version: --BuildNumber--
|
||||
Architecture: all
|
||||
Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net)
|
||||
Depends: swarmops-common,mono-runtime (>= 3.2.8),libmono-corlib4.0-cil (>= 3.2.8),libmono-posix4.0-cil (>= 3.2.8),libmono-system-data4.0-cil (>= 3.2.8),libmono-system-web-http4.0-cil (>= 3.2.8)
|
||||
Depends: swarmops-common (>= --BuildNumber--),mono-runtime (>= 3.2.8),libmono-corlib4.0-cil (>= 3.2.8),libmono-posix4.0-cil (>= 3.2.8),libmono-system-data4.0-cil (>= 3.2.8),libmono-system-web-http4.0-cil (>= 3.2.8)
|
||||
Conflicts: swarmops-backend-internal,swarmops-backend-stable
|
||||
Homepage: http://swarmops.com/
|
||||
Description: Swarmops Backend
|
||||
|
||||
@@ -2,7 +2,7 @@ Package: swarmops-frontend
|
||||
Version: --BuildNumber--
|
||||
Architecture: all
|
||||
Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net)
|
||||
Depends: swarmops-common, apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript
|
||||
Depends: swarmops-common (>= --BuildNumber--), apache2 (>= 2.2.20), mono-apache-server4 (>= 3.0.11), libapache2-mod-mono (>= 2.11), libgdiplus (>= 2.11), imagemagick, ghostscript
|
||||
Conflicts: swarmops-frontend-internal,swarmops-frontend-stable
|
||||
Homepage: http://swarmops.com/
|
||||
Description: Swarmops Frontend
|
||||
|
||||
@@ -1,6 +1,27 @@
|
||||
#! /bin/bash
|
||||
|
||||
#echo "Swarmops Frontend post-installation script running"
|
||||
#just make sure the upload folder exists and is writeable by www-data
|
||||
mkdir -p /var/lib/swarmops/upload
|
||||
chown www-data:www-data /var/lib/swarmops/upload
|
||||
# make sure the upload folder exists and is writeable by www-data
|
||||
# do not make any changes to an already existing folder
|
||||
|
||||
if [ ! -e /var/lib/swarmops/upload ]; then
|
||||
mkdir -p /var/lib/swarmops/upload
|
||||
chown www-data:www-data /var/lib/swarmops/upload
|
||||
chmod 777 /var/lib/swarmops/upload
|
||||
fi
|
||||
|
||||
# make sure the web frontend (and its init routine) can write to machineKey.config
|
||||
# TODO: add test here - only chown if it's the pristine, unedited file
|
||||
|
||||
chown www-data:www-data /etc/swarmops/machineKey.config
|
||||
|
||||
# make sure the web frontend (and its init) can write to database.config
|
||||
|
||||
chown www-data:www-data /etc/swarmops/database.config
|
||||
|
||||
# if we stopped Apache in preinst (1st install), restart it
|
||||
|
||||
if [ -e /tmp/swarmops-restart-apache.flag ]; then
|
||||
/etc/init.d/apache2 start
|
||||
rm /tmp/swarmops-restart-apache.flag
|
||||
fi
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
#! /bin/bash
|
||||
|
||||
# To circumvent lib-mod-mono bug on first install, stop Apache if it is currently running, before we try to install.
|
||||
# (It's very rude to shut down services without asking first like this, but even more rude of the lib-mod-mono
|
||||
# installer to just bloody hang.)
|
||||
|
||||
if [! -e /etc/swarmops/database.config ]; then
|
||||
if /etc/init.d/apache2 status > /dev/null; then
|
||||
# Set a flag to postinst to restart Apache
|
||||
echo foo > /tmp/swarmops-restart-apache.flag
|
||||
/etc/init.d/apache2 stop
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ cd ..
|
||||
#Update lines-of-code count
|
||||
cd ..
|
||||
BuildFiles/update-kaylock-count
|
||||
tail -n 1 LINESOFCODE | cut -c 2-7 | xargs printf "%'d" | xargs -I {} sed -i 's/<!--KaylockCount-->.*<!--EndKaylock-->/<!--KaylockCount-->{}<!--EndKaylock-->/' Site5/Default.aspx
|
||||
cd BuildFiles
|
||||
|
||||
#After this, a manual git push should be done
|
||||
|
||||
Reference in New Issue
Block a user