Commit 2d414892 authored by Steven Jones's avatar Steven Jones

Merge branch '6.x-1.x' into 6.x-2.x

Conflicts:
	aegir.make
	db/mysql/mysql_service.inc
	debian/changelog
	debian/gbp.conf
	example/basic/basic_service.inc
	http/Provision/Service/http/ssl.php
	http/nginx/nginx.conf
	http/nginx/nginx_advanced_include.conf
	http/nginx/nginx_service.inc
	http/nginx/nginx_simple_include.conf
	http/nginx/vhost.tpl.php
	http/nginx_ssl/nginx_ssl_service.inc
	http/nginx_ssl/server_ssl.tpl.php
	http/nginx_ssl/vhost_ssl.tpl.php
	http/nginx_ssl/vhost_ssl_disabled.tpl.php
	platform/provision_drupal.drush.inc
	provision.config.inc
	provision.context.inc
	provision.file.inc
	provision.info
	release.sh
	upgrade.sh.txt
parents dd14c967 f61e716d
......@@ -13,6 +13,30 @@ aegir-provision (2.0~alpha) UNRELEASED; urgency=low
-- Antoine Beaupré <anarcat@debian.org> Tue, 06 Mar 2012 14:39:41 -0500
aegir-provision (1.8) testing; urgency=low
* new release: various bugfixes to regressions introduced in 1.7, a few
general bug fixes and lots of Nginx fixes.
-- Steven Jones <steven.jones@computerminds.co.uk> Wed, 18 Apr 2012 09:34:44 +0100
aegir-provision (1.7) testing; urgency=low
* new release: various bugfixes that have accumulated in the issue queue
since the 1.6 release, including a lot of fixes on Nginx support. We
also ship a new clustering module aimed at lightweight slave
deployments named the pack module, designed to replace the cluster
module which has performance and configuration issues.
-- Antoine Beaupré <anarcat@debian.org> Tue, 06 Mar 2012 18:39:37 -0500
aegir-provision (1.6+dev) unstable; urgency=low
* merge in the debian branch to the main 1.x branch, making this a
native package.
-- Antoine Beaupré <anarcat@debian.org> Thu, 16 Feb 2012 15:47:18 -0500
aegir-provision (1.6-1+webpack) testing; urgency=low
* special build for the dev-webpack1x branch
......
......@@ -63,7 +63,7 @@ Description: mass Drupal hosting system
Package: aegir-cluster-slave
Architecture: all
Depends: ${misc:Depends}, php5-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5, rsync, nfs-client
Depends: ${misc:Depends}, php5-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5, rsync, nfs-client, mysql-client
Recommends: php5-gd, php5
Description: web frontend for the Aegir hosting system
Configuration of lightweight slave servers for the Aegir "pack"
......
......@@ -370,7 +370,6 @@ function _provision_drupal_maintain_aliases() {
}
else {
_provision_drupal_delete_aliases();
if (!d()->redirection) {
foreach (d()->aliases as $alias) {
if ($alias = trim($alias)) {
......@@ -399,7 +398,6 @@ function _provision_drupal_delete_aliases() {
}
else {
$aliases = provision_drupal_find_aliases();
foreach ($aliases as $alias) {
$path = d()->root . '/sites/' . $alias;
provision_file()->unlink($path)
......
......@@ -23,6 +23,7 @@ prompt_yes_no() {
}
version=$1
major="6.x"
if [ $# -lt 1 -o "$version" = "-h" ]; then
cat <<EOF
......@@ -42,7 +43,7 @@ official release. If you are not one of those people, you probably
shouldn't be running this.
This script is going to modify the configs and documentation to
release $version.
release $major-$version.
EOF
cat <<EOF
......@@ -74,18 +75,18 @@ git add debian/changelog
echo changing makefile to download tarball
#sed -i'.tmp' -e'/^projects\[hostmaster\]\[download\]\[type\]/s/=.*$/ = "get"/' \
# -e'/^projects\[hostmaster\]\[download\]\[url\]/s#=.*$#= "http://ftp.drupal.org/files/projects/hostmaster-'$version'.tgz"#' \
# -e'/^projects\[hostmaster\]\[download\]\[url\]/s#=.*$#= "http://ftp.drupal.org/files/projects/hostmaster-'$major-$version'.tgz"#' \
# -e'/^projects\[hostmaster\]\[download\]\[branch\].*/s/\[branch\] *=.*$/[directory_name] = "hostmaster"/' aegir.make && git add aegir.make && rm aegir.make.tmp
sed -i'.tmp' -e'/^projects\[hostmaster\]\[download\]\[type\]/s/=.*$/= "git"/' \
-e'/^projects\[hostmaster\]\[download\]\[url\]/s#=.*$#= "http://git.drupal.org/project/hostmaster.git"#' \
-e'/^projects\[hostmaster\]\[download\]\[branch\].*/s/\[branch\] *=.*$/[tag] = "'$version'"/' aegir.make && git add aegir.make && rm aegir.make.tmp
-e'/^projects\[hostmaster\]\[download\]\[branch\].*/s/\[branch\] *=.*$/[tag] = "'$major-$version'"/' aegir.make && git add aegir.make && rm aegir.make.tmp
echo changing provision.info version
sed -i'.tmp' -e"s/version *=.*$/version=$version/" provision.info
sed -i'.tmp' -e"s/version *=.*$/version=$major-$version/" provision.info
git add provision.info && rm provision.info.tmp
echo changing upgrade.sh.txt version
sed -i'.tmp' -e"s/AEGIR_VERSION=.*$/AEGIR_VERSION=\"$version\"/" upgrade.sh.txt && git add upgrade.sh.txt && rm upgrade.sh.txt.tmp
sed -i'.tmp' -e"s/AEGIR_VERSION=.*$/AEGIR_VERSION=\"$major-$version\"/" upgrade.sh.txt && git add upgrade.sh.txt && rm upgrade.sh.txt.tmp
echo resulting changes to be committed:
git diff --cached | cat
......@@ -101,10 +102,15 @@ fi
commitmsg=`git commit -m"change version information for release $version"`
echo $commitmsg
commitid=`echo $commitmsg | sed 's/^\[[^ ]* \([a-z0-9]*\)\].*$/\1/'`
sed -n '1,/ --/p' debian/changelog | git tag -a -F - $version
sed -n '1,/ --/p' debian/changelog | git tag -a -F - $major-$version
echo reverting tree to HEAD versions
git revert $commitid
git revert --no-commit $commitid
# Unstage the debian/changelog change, as we don't want to revert that.
git reset --quiet HEAD 'debian/changelog'
git checkout -- 'debian/changelog'
git commit
if prompt_yes_no "push tags and commits upstream? (y/N) "; then
# this makes sure we push the commit *and* the tag
......
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