update joomla, wordpress and drupal, add debian 7

diff --git a/debian-6.0-drupal/dab.conf b/debian-6.0-drupal/dab.conf
index 5be92a4cb09718f82bb6c82e95baae3554448ca2..ac2ad1f3772392a0552d94295752cabdfe4092e9 100644 (file)
--- a/debian-6.0-drupal/dab.conf
+++ b/debian-6.0-drupal/dab.conf
@@ -1,13 +1,13 @@
 Suite: squeeze
 CacheDir: ../cache
-#Source: http://ftp.debian.org/debian SUITE main contrib
-#Source: http://ftp.debian.org/debian SUITE-updates main contrib
-#Source: http://security.debian.org SUITE/updates main contrib
+Source: http://ftp.debian.org/debian SUITE main contrib
+Source: http://ftp.debian.org/debian SUITE-updates main contrib
+Source: http://security.debian.org SUITE/updates main contrib
 Source: http://backports.debian.org/debian-backports SUITE-backports main
 Architecture: i386
 Name: drupal
-Version: 6.20-1
-Depends: drupal6 (= 6.20-1~bpo60+1)
+Version: 6.26-2
+Depends: drupal6 (= 6.26-1~bpo60+1)
 Section: www
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Infopage: http://pve.proxmox.com/wiki/Drupal

diff --git a/debian-6.0-joomla/Joomla_1.6.3-Stable-Full_Package.tar.gz b/debian-6.0-joomla/Joomla_1.6.3-Stable-Full_Package.tar.gz
deleted file mode 100644 (file)
index a368153..0000000
Binary files a/debian-6.0-joomla/Joomla_1.6.3-Stable-Full_Package.tar.gz and /dev/null differ

diff --git a/debian-6.0-joomla/Joomla_2.5.7-Stable-Full_Package.tar.gz b/debian-6.0-joomla/Joomla_2.5.7-Stable-Full_Package.tar.gz
new file mode 100644 (file)
index 0000000..20f109e
Binary files /dev/null and b/debian-6.0-joomla/Joomla_2.5.7-Stable-Full_Package.tar.gz differ

diff --git a/debian-6.0-joomla/Makefile b/debian-6.0-joomla/Makefile
index 91381255576b39ea2eedd5941f6a15ef511a9794..85d5f9aabf6927ac05f69060c6dceee04ed20212 100644 (file)
--- a/debian-6.0-joomla/Makefile
+++ b/debian-6.0-joomla/Makefile
@@ -11,7 +11,7 @@ all: info/init_ok
        sed -e 's/^\s*output_buffering\s*=\s*4096/output_buffering = off/' -i ${BASEDIR}/etc/php5/apache2/php.ini
        dab install php5-mysql
        mkdir ${BASEDIR}/var/www/joomla
-       tar -xzf Joomla_1.6.3-Stable-Full_Package.tar.gz -C ${BASEDIR}/var/www/joomla
+       tar -xzf Joomla_2.5.7-Stable-Full_Package.tar.gz -C ${BASEDIR}/var/www/joomla
        touch ${BASEDIR}/var/www/joomla/configuration.php
        find ${BASEDIR}/var/www/joomla -type f -exec chmod 644 \{\} \;
        find ${BASEDIR}/var/www/joomla -type d -exec chmod 755 \{\} \;

diff --git a/debian-6.0-joomla/dab.conf b/debian-6.0-joomla/dab.conf
index 90b3a2c04e24ec106d54231069d7e70451924619..5f74af8c3f670aebbebaaa4c9c9dc852d6d7d519 100644 (file)
--- a/debian-6.0-joomla/dab.conf
+++ b/debian-6.0-joomla/dab.conf
@@ -5,7 +5,7 @@ CacheDir: ../cache
 #Source: http://security.debian.org SUITE/updates main contrib
 Architecture: i386
 Name: joomla
-Version: 1.6-3
+Version: 2.5-2
 Section: www
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Infopage: http://pve.proxmox.com/wiki/Joomla!

diff --git a/debian-6.0-standard-64/dab.conf b/debian-6.0-standard-64/dab.conf
index 370f6d1c9860ab0c5d031d74d48ab5a69cca1f24..ba9dc0528c289a8d7e69e2e0a7946233a7fbab28 100644 (file)
--- a/debian-6.0-standard-64/dab.conf
+++ b/debian-6.0-standard-64/dab.conf
@@ -5,7 +5,7 @@ CacheDir: ../cache
 #Source: http://security.debian.org SUITE/updates main contrib
 Architecture: amd64
 Name: debian-6.0-standard
-Version: 6.0-4
+Version: 6.0-6
 Section: system
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Infopage: http://pve.proxmox.com/wiki/Debian_6.0_Standard

diff --git a/debian-6.0-standard/dab.conf b/debian-6.0-standard/dab.conf
index ff92c37bb34a7d5d0bedd3439f8b9c8eec8b1a90..cafbff18e8f41723cd60059449ba8b40ba1ce516 100644 (file)
--- a/debian-6.0-standard/dab.conf
+++ b/debian-6.0-standard/dab.conf
@@ -5,7 +5,7 @@ CacheDir: ../cache
 #Source: http://security.debian.org SUITE/updates main contrib 
 Architecture: i386
 Name: debian-6.0-standard
-Version: 6.0-4
+Version: 6.0-6
 Section: system
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Infopage: http://pve.proxmox.com/wiki/Debian_6.0_Standard

diff --git a/debian-6.0-wordpress/dab.conf b/debian-6.0-wordpress/dab.conf
index 45c7a8683b35aa6892994ca2b610e7d62f7f8bb4..083494b3d4a2989eb2e0189452c8512ae72551c4 100644 (file)
--- a/debian-6.0-wordpress/dab.conf
+++ b/debian-6.0-wordpress/dab.conf
@@ -5,7 +5,7 @@ CacheDir: ../cache
 #Source: http://security.debian.org SUITE/updates main contrib
 Architecture: i386
 Name: wordpress
-Version: 3.1.2-1
+Version: 3.4.2-1
 Section: www
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Infopage: http://pve.proxmox.com/wiki/Wordpress

diff --git a/debian-7.0-standard-64/Makefile b/debian-7.0-standard-64/Makefile
new file mode 100644 (file)
index 0000000..c1fa802
--- /dev/null
+++ b/debian-7.0-standard-64/Makefile
@@ -0,0 +1,21 @@
+
+
+BASEDIR:=$(shell dab basedir)
+
+all: info/init_ok
+       dab bootstrap
+       dab finalize
+
+info/init_ok: dab.conf
+       dab init
+       touch $@
+
+.PHONY: clean
+clean:
+       dab clean
+       rm -f *~
+
+.PHONY: dist-clean
+dist-clean:
+       dab dist-clean
+       rm -f *~

diff --git a/debian-7.0-standard-64/dab.conf b/debian-7.0-standard-64/dab.conf
new file mode 100644 (file)
index 0000000..c0cb97b
--- /dev/null
+++ b/debian-7.0-standard-64/dab.conf
@@ -0,0 +1,13 @@
+Suite: wheezy
+CacheDir: ../cache
+#Source: http://ftp.debian.org/debian SUITE main contrib
+#Source: http://ftp.debian.org/debian SUITE-updates main contrib
+#Source: http://security.debian.org SUITE/updates main contrib 
+Architecture: amd64
+Name: debian-7.0-standard
+Version: 7.0-1
+Section: system
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Infopage: http://pve.proxmox.com/wiki/Debian_7.0_Standard
+Description: Debian 7.0 (standard)
+ A small Debian Wheezy system including all standard packages.

diff --git a/debian-7.0-standard/Makefile b/debian-7.0-standard/Makefile
new file mode 100644 (file)
index 0000000..c1fa802
--- /dev/null
+++ b/debian-7.0-standard/Makefile
@@ -0,0 +1,21 @@
+
+
+BASEDIR:=$(shell dab basedir)
+
+all: info/init_ok
+       dab bootstrap
+       dab finalize
+
+info/init_ok: dab.conf
+       dab init
+       touch $@
+
+.PHONY: clean
+clean:
+       dab clean
+       rm -f *~
+
+.PHONY: dist-clean
+dist-clean:
+       dab dist-clean
+       rm -f *~

diff --git a/debian-7.0-standard/dab.conf b/debian-7.0-standard/dab.conf
new file mode 100644 (file)
index 0000000..539c1d9
--- /dev/null
+++ b/debian-7.0-standard/dab.conf
@@ -0,0 +1,13 @@
+Suite: wheezy
+CacheDir: ../cache
+#Source: http://ftp.debian.org/debian SUITE main contrib
+#Source: http://ftp.debian.org/debian SUITE-updates main contrib
+#Source: http://security.debian.org SUITE/updates main contrib 
+Architecture: i386
+Name: debian-7.0-standard
+Version: 7.0-1
+Section: system
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Infopage: http://pve.proxmox.com/wiki/Debian_7.0_Standard
+Description: Debian 7.0 (standard)
+ A small Debian Wheezy system including all standard packages.