diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | domjudge-domserver.install | 10 |
3 files changed, 18 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = domjudge pkgdesc = an automated judge system to run programming contests - pkgver = 7.0.1 - pkgrel = 2 + pkgver = 7.0.2 + pkgrel = 1 url = http://www.domjudge.org/ arch = x86_64 license = GPL @@ -15,13 +15,13 @@ pkgbase = domjudge optdepends = phpmyadmin: to access database in an emergency optdepends = ntp: to keep judgehosts clocks in sync optdepends = beep: for notification of errors - source = https://www.domjudge.org/releases/domjudge-7.0.1.tar.gz + source = https://www.domjudge.org/releases/domjudge-7.0.2.tar.gz source = domjudge-domserver.conf source = domjudge-judgehost.conf source = domjudge-judgehostd.service source = domjudge-judgehostd@.service source = domjudge-cgroup.service - sha256sums = e17029235fee301aa438cc3607855619f2d06fc7c42963451c665be45514c2cc + sha256sums = 0c311c18dc505fd5cbc231bc7740842058e7d1c2e8eb400995a55420b3740a57 sha256sums = c0dfd31c0d19856df324057ffb4f81d50fe765c48026d419ceaea71864663532 sha256sums = 06faeeea3e3abda5a53a9ae150c6289cd49062c9a22129436640d11a9948eed5 sha256sums = 9ed301acc46bcc4de0ac38fc7fa9abe13912deb64ff549dd68ada54b9158f680 @@ -50,6 +50,7 @@ pkgname = domjudge-domserver backup = etc/domserver/nginx-conf-inner backup = etc/domserver/restapi.secret backup = etc/domserver/verdicts.php + backup = var/lib/domserver/webapp/app/config/parameters.yml pkgname = domjudge-docs arch = any @@ -2,8 +2,8 @@ pkgbase=domjudge pkgname=('domjudge-domserver' 'domjudge-docs' 'domjudge-judgehost' 'domjudge-submit') -pkgver=7.0.1 -pkgrel=2 +pkgver=7.0.2 +pkgrel=1 pkgdesc="an automated judge system to run programming contests" arch=("$CARCH") url="http://www.domjudge.org/" @@ -21,7 +21,7 @@ source=( domjudge-judgehostd.service domjudge-judgehostd@.service domjudge-cgroup.service) -sha256sums=('e17029235fee301aa438cc3607855619f2d06fc7c42963451c665be45514c2cc' +sha256sums=('0c311c18dc505fd5cbc231bc7740842058e7d1c2e8eb400995a55420b3740a57' 'c0dfd31c0d19856df324057ffb4f81d50fe765c48026d419ceaea71864663532' '06faeeea3e3abda5a53a9ae150c6289cd49062c9a22129436640d11a9948eed5' '9ed301acc46bcc4de0ac38fc7fa9abe13912deb64ff549dd68ada54b9158f680' @@ -74,7 +74,7 @@ package_domjudge-submit() { package_domjudge-domserver() { arch=('any') depends=('curl' 'php' 'php-gd' 'php-intl' 'unzip' 'zip' 'apache') - backup=('etc/domserver/apache.conf' 'etc/domserver/common-config.php' 'etc/domserver/dbpasswords.secret' 'etc/domserver/domjudge-fpm.conf' 'etc/domserver/domserver-config.php' 'etc/domserver/domserver-static.php' 'etc/domserver/import-forwardfeed.yaml' 'etc/domserver/initial_admin_password.secret' 'etc/domserver/nginx-conf' 'etc/domserver/nginx-conf-inner' 'etc/domserver/restapi.secret' 'etc/domserver/verdicts.php') + backup=('etc/domserver/apache.conf' 'etc/domserver/common-config.php' 'etc/domserver/dbpasswords.secret' 'etc/domserver/domjudge-fpm.conf' 'etc/domserver/domserver-config.php' 'etc/domserver/domserver-static.php' 'etc/domserver/import-forwardfeed.yaml' 'etc/domserver/initial_admin_password.secret' 'etc/domserver/nginx-conf' 'etc/domserver/nginx-conf-inner' 'etc/domserver/restapi.secret' 'etc/domserver/verdicts.php' 'var/lib/domserver/webapp/app/config/parameters.yml') install=domjudge-domserver.install cd "$srcdir/domjudge-$pkgver" make install-domserver DESTDIR="$pkgdir"/ @@ -82,6 +82,8 @@ package_domjudge-domserver() { echo "" > "$pkgdir/etc/domserver/initial_admin_password.secret" echo "" > "$pkgdir/etc/domserver/restapi.secret" echo "" > "$pkgdir/etc/domserver/dbpasswords.secret" + # install the password generating util for the php config + install -Dm 755 "$srcdir/domjudge-$pkgver/etc/gensymfonyparams" "$pkgdir/etc/domserver/gensymfonyparams" install -Dm 644 "$srcdir/domjudge-domserver.conf" "$pkgdir/usr/lib/sysusers.d/domjudge-domserver.conf" } diff --git a/domjudge-domserver.install b/domjudge-domserver.install index 1d65c7a2bcfe..dcf9be331789 100644 --- a/domjudge-domserver.install +++ b/domjudge-domserver.install @@ -3,9 +3,13 @@ clear_cache(){ } post_install(){ - /etc/domserver/genadminpassword > /etc/domserver/initial_admin_password.secret - /etc/domserver/genrestapicredentials > /etc/domserver/restapi.secret - /etc/domserver/gendbpasswords > /etc/domserver/dbpasswords.secret + /etc/domserver/genadminpassword > /etc/domserver/initial_admin_password.secret + /etc/domserver/genrestapicredentials > /etc/domserver/restapi.secret + /etc/domserver/gendbpasswords > /etc/domserver/dbpasswords.secret + /etc/domserver/gensymfonyparams \ + /var/lib/domserver/webapp/app/config/parameters.yml.dist \ + /etc/domserver/dbpasswords.secret \ + > /var/lib/domserver/webapp/app/config/parameters.yml } pre_remove(){ |