Commit c512f357 authored by Jon Pugh's avatar Jon Pugh

Merge branch '7.x-3.x' into 7.x-3.x-devshop

parents c8655de0 c3d1f179
core = 7.x
api = 2
; this makefile fetches the latest release from Drupal.org
; it is maintained through the release.sh script
projects[hostmaster][type] = "core"
; This makefile fetches the latest release of Drupal from Drupal.org.
projects[drupal][type] = "core"
; The release.sh script updates the version of hostmaster.
projects[hostmaster][version] = "7.x-3.0-dev"
projects[hostmaster][type] = "profile"
projects[hostmaster][variant] = "projects"
aegir3-provision (3.9) unstable; urgency=medium
* Makefile tweaks to allow for minor releases to update Drupal core
* Many bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.9
-- Herman van Rink <helmo@initfour.nl> Thu, 05 Jan 2017 20:23:06 +0100
aegir3-provision (3.9~beta1) unstable; urgency=medium
* Preparations for the 3.9 release
* Makefile tweaks to allow for minor releases to update Drupal core
* Many bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.9
-- Herman van Rink <helmo@initfour.nl> Thu, 15 Dec 2016 21:15:10 +0100
aegir3-provision (3.8) unstable; urgency=medium
* Another stable release of the 3.x series.
......
......@@ -288,7 +288,7 @@ map $http_user_agent $deny_on_high_load {
###
map $args $is_denied {
default '';
~*delete.+from|insert.+into|select.+from|union.+select|onload|\.php.+src|system\(.+|document\.cookie|\;|\.\. is_denied;
~*delete.+from|insert.+into|select.+from|union.+select|onload|\.php.+src|system\(.+|document\.cookie|\;|\.\.\/ is_denied;
}
<?php endif; ?>
......
......@@ -63,8 +63,11 @@ function provision_drupal_drush_exit() {
}
}
elseif (d()->type === 'platform') {
// Don't generate the drushrc.php on provision-save/delete commands.
if (!preg_match("/^provision-(save|delete)/", $command[0])) {
// Don't generate the drushrc.php on provision-save/delete/git-clone commands.
// Avoiding running on git-clone is needed in order to let it work with makefiles in the git repo.
// If this function runs, the platform directory is created, and drush make fails because the directory already exists.
// @TODO: Determine what tasks should save platform data and only act on those.
if (!preg_match("/^provision-(save|delete|git-clone)/", $command[0])) {
provision_save_platform_data();
}
}
......
......@@ -80,7 +80,7 @@ dch -v $debversion -D unstable
git add debian/changelog
echo changing hostmaster version in aegir-release.make
sed -i'.tmp' -e '/^projects\[hostmaster\]\[version\]/s/=.*$/= "'"$major-$version"'"/' aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp
sed -i'.tmp' -e '/^projects\[hostmaster\]\[version\]/s/=.*$/= "'"$version"'"/' aegir-release.make && git add aegir-release.make && rm aegir-release.make.tmp
echo enabling release makefilexs
ln -sf aegir-release.make aegir.make && git add aegir.make
......@@ -125,9 +125,20 @@ mkdir -p build-area;
rm -rf build-area/hostmaster
git clone --branch $CURRENT_BRANCH `git config remote.origin.url | sed 's/provision/hostmaster/'` build-area/hostmaster
cd build-area/hostmaster
echo changing hostmaster.make versions
ln -sf drupal-org.make hostmaster.make && git add hostmaster.make
cd -
git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git commit -m"change version information for release $version"
echo "Setting the tag $NEW_TAG in a clean hostmaster clone."
git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git tag -a $NEW_TAG -m 'Add a new release tag.'
echo reverting tree to HEAD versions
git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git revert HEAD
# Hosting
rm -rf build-area/hosting
git clone --branch $CURRENT_BRANCH `git config remote.origin.url | sed 's/provision/hosting/'` build-area/hosting
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment