From f716325f16fbabcc7586d67bc1aa4506a23754c7 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Fri, 8 Apr 2011 05:37:54 -0500 Subject: testing/pdns-gui: should work now --- testing/pdns-gui/0020-update-for-mysql55.patch | 67 ++++++++++++++++++++++ ...remove-zend.ze1_compatibility_mode-option.patch | 12 ++++ .../0040-alpine-default-htaccess-fix.patch | 11 ++++ testing/pdns-gui/APKBUILD | 32 +++++++++-- testing/pdns-gui/pdns-gui.apache2.conf | 7 +++ testing/pdns-gui/pdns-gui.post-install | 12 ++-- testing/pdns-gui/pdns-gui.post-upgrade | 6 +- 7 files changed, 136 insertions(+), 11 deletions(-) create mode 100644 testing/pdns-gui/0020-update-for-mysql55.patch create mode 100644 testing/pdns-gui/0030-remove-zend.ze1_compatibility_mode-option.patch create mode 100644 testing/pdns-gui/0040-alpine-default-htaccess-fix.patch create mode 100644 testing/pdns-gui/pdns-gui.apache2.conf (limited to 'testing/pdns-gui') diff --git a/testing/pdns-gui/0020-update-for-mysql55.patch b/testing/pdns-gui/0020-update-for-mysql55.patch new file mode 100644 index 00000000..2f2800a2 --- /dev/null +++ b/testing/pdns-gui/0020-update-for-mysql55.patch @@ -0,0 +1,67 @@ +--- ./data/sql/lib.model.schema.sql.orig ++++ ./data/sql/lib.model.schema.sql +@@ -21,7 +21,7 @@ + `account` VARCHAR(40), + PRIMARY KEY (`id`), + UNIQUE KEY `name_index` (`name`) +-)Type=MyISAM; ++) Engine=MyISAM; + + #----------------------------------------------------------------------------- + #-- records +@@ -47,7 +47,7 @@ + CONSTRAINT `records_FK_1` + FOREIGN KEY (`domain_id`) + REFERENCES `domains` (`id`) +-)Type=MyISAM; ++) Engine=MyISAM; + + #----------------------------------------------------------------------------- + #-- supermasters +@@ -63,7 +63,7 @@ + `account` VARCHAR(40), + `id` INTEGER NOT NULL AUTO_INCREMENT, + PRIMARY KEY (`id`) +-)Type=MyISAM; ++) Engine=MyISAM; + + #----------------------------------------------------------------------------- + #-- template +@@ -78,7 +78,7 @@ + `name` VARCHAR(255), + `type` VARCHAR(45), + PRIMARY KEY (`id`) +-)Type=MyISAM; ++) Engine=MyISAM; + + #----------------------------------------------------------------------------- + #-- template_record +@@ -101,7 +101,7 @@ + CONSTRAINT `template_record_FK_1` + FOREIGN KEY (`template_id`) + REFERENCES `template` (`id`) +-)Type=MyISAM; ++) Engine=MyISAM; + + #----------------------------------------------------------------------------- + #-- setting +@@ -115,7 +115,7 @@ + `name` VARCHAR(255) NOT NULL, + `value` TEXT, + PRIMARY KEY (`name`) +-)Type=MyISAM; ++) Engine=MyISAM; + + # This restores the fkey checks, after having unset them earlier + SET FOREIGN_KEY_CHECKS = 1; +--- ./data/sql/plugins.sfPropelAuditPlugin.lib.model.schema.sql.orig ++++ ./data/sql/plugins.sfPropelAuditPlugin.lib.model.schema.sql +@@ -22,7 +22,7 @@ + `type` VARCHAR(255), + `created_at` DATETIME, + PRIMARY KEY (`id`) +-)Type=MyISAM; ++) Engine=MyISAM; + + # This restores the fkey checks, after having unset them earlier + SET FOREIGN_KEY_CHECKS = 1; diff --git a/testing/pdns-gui/0030-remove-zend.ze1_compatibility_mode-option.patch b/testing/pdns-gui/0030-remove-zend.ze1_compatibility_mode-option.patch new file mode 100644 index 00000000..6c3c5a7a --- /dev/null +++ b/testing/pdns-gui/0030-remove-zend.ze1_compatibility_mode-option.patch @@ -0,0 +1,12 @@ +--- ./data/symfony/config/php.yml.orig ++++ ./data/symfony/config/php.yml +@@ -4,9 +4,6 @@ + arg_separator.output: | + & + +-check: +- zend.ze1_compatibility_mode: off +- + warn: + magic_quotes_gpc: off + register_globals: off diff --git a/testing/pdns-gui/0040-alpine-default-htaccess-fix.patch b/testing/pdns-gui/0040-alpine-default-htaccess-fix.patch new file mode 100644 index 00000000..4842a425 --- /dev/null +++ b/testing/pdns-gui/0040-alpine-default-htaccess-fix.patch @@ -0,0 +1,11 @@ +--- ./web/.htaccess.orig ++++ ./web/.htaccess +@@ -5,7 +5,7 @@ + + # uncomment the following line, if you are having trouble + # getting no_script_name to work +- #RewriteBase / ++ RewriteBase /pdns-gui + + # we skip all files with .something + # comment the following 3 lines to allow periods in routes diff --git a/testing/pdns-gui/APKBUILD b/testing/pdns-gui/APKBUILD index f7a82dc0..48127901 100644 --- a/testing/pdns-gui/APKBUILD +++ b/testing/pdns-gui/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matt Smith pkgname=pdns-gui pkgver=0.3.3 -pkgrel=0 +pkgrel=1 pkgdesc="Web-based GUI for administering PowerDNS" url="http://code.google.com/p/pdns-gui/" arch="noarch" @@ -14,6 +14,10 @@ install="$pkgname.post-install $pkgname.post-upgrade" subpackages= source="http://$pkgname.googlecode.com/files/$pkgname.$pkgver.tgz 0010-replace-bash-with-sh.patch + 0020-update-for-mysql55.patch + 0030-remove-zend.ze1_compatibility_mode-option.patch + 0040-alpine-default-htaccess-fix.patch + $pkgname.apache2.conf " _builddir="$srcdir"/$pkgname.$pkgver @@ -32,10 +36,28 @@ build() { } package() { - mkdir -p "$pkgdir"/var/www/$pkgname || return 1 - cp -a "$_builddir"/* "$pkgdir"/var/www/$pkgname/ || return 1 - rm "$pkgdir"/var/www/$pkgname/INSTALL || return 1 + # copy pdns-gui + mkdir -p "$pkgdir"/usr/share/webapps/$pkgname || return 1 + cp -a "$_builddir"/* "$pkgdir"/usr/share/webapps/$pkgname/ || return 1 + + # move log directory + mkdir -p "$pkgdir"/var/log/$pkgname || return 1 + chmod 2755 "$pkgdir"/var/log/$pkgname || return 1 + rm -rf "$pkgdir"/usr/share/webapps/$pkgname/log || return 1 + ln -fs /var/log/$pkgname "$pkgdir"/usr/share/webapps/$pkgname/log \ + || return 1 + + # remove the install file + rm "$pkgdir"/usr/share/webapps/$pkgname/INSTALL || return 1 + + # install the apache2 config + install -Dm644 "$srcdir"/$pkgname.apache2.conf \ + "$pkgdir"/etc/apache2/conf.d/$pkgname.conf || return 1 } md5sums="caa45c5408764ccd98cfffd69e5e976f pdns-gui.0.3.3.tgz -98acdea457a4805c77cea373a6d57029 0010-replace-bash-with-sh.patch" +98acdea457a4805c77cea373a6d57029 0010-replace-bash-with-sh.patch +21683d18b30aef6082803339413f8c42 0020-update-for-mysql55.patch +8865c965b6c81dbf2d9de5f8956b0ae0 0030-remove-zend.ze1_compatibility_mode-option.patch +d621eecb4f688640cb514aff1ea8ef7d 0040-alpine-default-htaccess-fix.patch +2a4d9133e4ac0c22ed7bd408052b5de0 pdns-gui.apache2.conf" diff --git a/testing/pdns-gui/pdns-gui.apache2.conf b/testing/pdns-gui/pdns-gui.apache2.conf new file mode 100644 index 00000000..35e86685 --- /dev/null +++ b/testing/pdns-gui/pdns-gui.apache2.conf @@ -0,0 +1,7 @@ +Alias /pdns-gui "/usr/share/webapps/pdns-gui/web" + + AllowOverride All + Options FollowSymlinks + Order allow,deny + Allow from all + diff --git a/testing/pdns-gui/pdns-gui.post-install b/testing/pdns-gui/pdns-gui.post-install index 40eb23fb..4bc6d990 100644 --- a/testing/pdns-gui/pdns-gui.post-install +++ b/testing/pdns-gui/pdns-gui.post-install @@ -1,8 +1,12 @@ #!/bin/sh -echo -e "\npdns-gui has been installed in: /var/www/pdns-gui" -echo -e "Be sure to set the correct ownership as per your webserver, and -echo -e "finish installing pdns-gui by running the following script:" -echo -e " /var/www/pdns-gui/batch/install.sh\n" +echo "*" >&2 +echo "* pdns-gui has been installed in: /usr/share/webapps/pdns-gui" >&2 +echo "* pdns-gui logs are at : /var/log/pdns-gui" >&2 +echo "* pdns-gui apache2 config is at : /etc/apache2/conf.d/pdns-gui.conf" >&2 +echo "*" >&2 +echo "* To finish installing pdns-gui, please run the following script:" >&2 +echo "* /usr/share/webapps/pdns-gui/batch/install.sh" >&2 +echo "*" >&2 exit 0 diff --git a/testing/pdns-gui/pdns-gui.post-upgrade b/testing/pdns-gui/pdns-gui.post-upgrade index 2106e386..7d9922a5 100644 --- a/testing/pdns-gui/pdns-gui.post-upgrade +++ b/testing/pdns-gui/pdns-gui.post-upgrade @@ -1,6 +1,8 @@ #!/bin/sh -echo -e "\nTo finish upgrading pdns-gui, run the following script:" -echo -e "/var/www/pdns-gui/batch/upgrade.sh\n" +echo "*" >&2 +echo "* To finish upgrading pdns-gui, please run the following script:" >&2 +echo "* /usr/share/webapps/pdns-gui/batch/upgrade.sh" >&2 +echo "*" >&2 exit 0 -- cgit v1.2.3