Date: Sunday, December 29, 2013 @ 15:45:44 Author: fyan Revision: 103189
upgpkg: goagent 3.1.2-2 Added: goagent/trunk/goagent.user.ini Modified: goagent/trunk/PKGBUILD goagent/trunk/goagent.install -----------------+ PKGBUILD | 11 +++++++---- goagent.install | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-12-29 13:15:55 UTC (rev 103188) +++ PKGBUILD 2013-12-29 14:45:44 UTC (rev 103189) @@ -5,7 +5,7 @@ pkgname=goagent pkgver=3.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="A gae proxy forked from gappproxy/wallproxy" arch=("any") url="http://goagent.googlecode.com" @@ -16,7 +16,8 @@ 'python2-crypto: optimization for RC4') makedepends=('git') source=("git+https://github.com/goagent/goagent.git#tag=v$pkgver" - "$pkgname.service") + "${pkgname}.user.ini" + "${pkgname}.service") backup=('etc/goagent') install=goagent.install @@ -31,8 +32,9 @@ install -Dm644 local/SwitchyOptions.bak "$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak" install -Dm644 local/SwitchySharp.crx "$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx" - install -Dm640 -g nobody local/proxy.ini "$pkgdir/etc/goagent" - ln -sf "/etc/goagent" "${pkgdir}/usr/share/$pkgname/local/goagent.ini" + install -Dm644 local/proxy.ini "$pkgdir/usr/share/$pkgname/local/goagent.ini" + install -Dm640 -g nobody ../goagent.user.ini "$pkgdir/etc/goagent" + ln -sf "/etc/goagent" "${pkgdir}/usr/share/$pkgname/local/goagent.user.ini" cp -r server "$pkgdir/usr/share/$pkgname/" rm "$pkgdir/usr/share/$pkgname/server/uploader.bat" @@ -43,4 +45,5 @@ # vim:set ts=2 sw=2 et: sha512sums=('SKIP' + 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e' '4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c') Modified: goagent.install =================================================================== --- goagent.install 2013-12-29 13:15:55 UTC (rev 103188) +++ goagent.install 2013-12-29 14:45:44 UTC (rev 103189) @@ -1,6 +1,5 @@ post_install() { - echo "Please use systemd units to start/stop goagent:" - echo "sudo systemctl start/stop goagent" + echo "From 3.1.2-2, /etc/goagent becomes user configuration for goagent. Put any customization there, not the default settings. For details, please refer to wiki: https://wiki.archlinux.org/index.php?title=GoAgent_(%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87)" #cd /opt/goagent/local #python2 -c 'from proxy import CertUtil; CertUtil.check_ca()' Added: goagent.user.ini ===================================================================