Date: Sunday, May 12, 2019 @ 12:36:33 Author: kkeen Revision: 466370 upgpkg: hiawatha 10.9-2 FS#61903
Added: hiawatha/trunk/lefh-renew.service hiawatha/trunk/lefh-renew.timer Modified: hiawatha/trunk/PKGBUILD Deleted: hiawatha/trunk/letsencrypt-renew.service hiawatha/trunk/letsencrypt-renew.timer ---------------------------+ PKGBUILD | 50 ++++++++++++++++++++++---------------------- lefh-renew.service | 9 +++++++ lefh-renew.timer | 11 +++++++++ letsencrypt-renew.service | 8 ------- letsencrypt-renew.timer | 11 --------- 5 files changed, 46 insertions(+), 43 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-05-12 12:34:41 UTC (rev 466369) +++ PKGBUILD 2019-05-12 12:36:33 UTC (rev 466370) @@ -1,10 +1,11 @@ # Maintainer: Kyle Keen <[email protected]> # Contributor: Kurt Marasco <celilo _at_ lavabit _dot_ com> # Contributor: Pascal Ernster <aur at hardfalcon dot net> +# Contributor: Kewl <kewl at alto dot eu dot org> pkgname=hiawatha pkgver=10.9 -pkgrel=1 +pkgrel=2 pkgdesc="Secure and advanced webserver" url="https://www.hiawatha-webserver.org/"; arch=('x86_64') @@ -11,7 +12,7 @@ license=('GPL2') depends=('libxslt' 'mbedtls') optdepends=('php-fpm: PHP fastcgi' - 'php: letsencrypt') + 'php: letsencrypt/lefh') makedepends=('cmake') backup=( 'etc/hiawatha/hiawatha.conf' @@ -23,19 +24,32 @@ "https://www.hiawatha-webserver.org/files/$pkgname-$pkgver.tar.gz"; 'hiawatha.conf.sample' 'hiawatha.service' - 'letsencrypt-renew.service' - 'letsencrypt-renew.timer' + 'lefh-renew.service' + 'lefh-renew.timer' ) sha256sums=('74dd43812272c3ddbf067b6d4da1773cdeef2ffe71e8f164449fabf8431752b8' '4671d2586cbe3cd6497b16ff422c6143cdab40641ef3c9c4988c478351a8f5e7' 'fb789b12bb6246237b15a9244f58317abdd53e5ca4eb55880e40a498b2237155' - '7f903aadf1e7e4bf449c9a647f160051358ef1e2db328afffc7f3a5c204f8ea5' - 'a1d5371e886bdd697c9d040125aa5b117d6efe36bb6ee77b57004d893f2bc410') + 'db1d647d86370583c24ae7a37feab78e3f0015d441ff5bc8f9b32e1a91ec4c8e' + 'd12c5a68c293f66d95ae4df704ea349adbad972fb25475ab1a0a24fb42bfc70b') prepare() { cd "$srcdir/$pkgname-$pkgver" sed -i 's/www-data/http/g' extra/logrotate.in + + # Update stock hiawatha.conf + sed -e 's|#ServerId = www-data|ServerId = http|' \ + -e 's|/var/www/|/srv/http/|g' \ + -e 's|//|/|g' \ + -e 's|#CGIextension = cgi|&\n#TriggerOnCGIstatus = no|g' \ + -e 's|ConnectTo = 127.0.0.1:2005|ConnectTo = 127.0.0.1:9000|g' \ + -e 's|# Extension = php|&\n# SessionTimeout = 30|g' \ + -e 's|#ErrorHandler = 404:/error.cgi|&\n#UseGZfile = yes|g' \ + -i config/hiawatha.conf.in + + sed -e 's|/etc/init.d/hiawatha restart|systemctl restart hiawatha.service|' \ + -i extra/letsencrypt/letsencrypt.conf.in } build() { @@ -69,7 +83,7 @@ # Features disabled by default # -DENABLE_DEBUG - # -DENABLE_TOMAHAWK + # -DENABLE_TOMAHAWK } package() { @@ -80,23 +94,11 @@ rm "$pkgdir/srv/http/hiawatha/index.html" rmdir -p --ignore-fail-on-non-empty "$pkgdir/srv/http/hiawatha" - # Update stock hiawatha.conf - sed -e 's|#ServerId = www-data|ServerId = http|' \ - -e 's|/var/www/|/srv/http/|g' \ - -e 's|//|/|g' \ - -e 's|#CGIextension = cgi|&\n#TriggerOnCGIstatus = no|g' \ - -e 's|ConnectTo = 127.0.0.1:2005|ConnectTo = 127.0.0.1:9000|g' \ - -e 's|# Extension = php|&\n# SessionTimeout = 30|g' \ - -e 's|#ErrorHandler = 404:/error.cgi|&\n#UseGZfile = yes|g' \ - -i "$pkgdir/etc/hiawatha/hiawatha.conf" - install -Dm644 logrotate.d/hiawatha "$pkgdir/etc/logrotate.d/hiawatha" - install -Dm644 "$srcdir/hiawatha.service" "$pkgdir/usr/lib/systemd/system/hiawatha.service" - install -Dm644 "$srcdir/hiawatha.conf.sample" "$pkgdir/etc/hiawatha/" - - mkdir -p "$pkgdir/usr/share/hiawatha/" - cd "$srcdir/$pkgname-$pkgver/extra/" - cp "$srcdir/letsencrypt-renew."* letsencrypt/ - tar -caf "$pkgdir/usr/share/hiawatha/letsencrypt.tar.gz" letsencrypt/* + cd "$srcdir" + install -Dm644 hiawatha.service "$pkgdir/usr/lib/systemd/system/hiawatha.service" + install -Dm644 lefh-renew.service "$pkgdir/usr/lib/systemd/system/lefh-renew.service" + install -Dm644 lefh-renew.timer "$pkgdir/usr/lib/systemd/system/lefh-renew.timer" + install -Dm644 hiawatha.conf.sample "$pkgdir/etc/hiawatha/" } Added: lefh-renew.service =================================================================== --- lefh-renew.service (rev 0) +++ lefh-renew.service 2019-05-12 12:36:33 UTC (rev 466370) @@ -0,0 +1,9 @@ +[Unit] +Description=Renew Let's Encrypt certificates for Hiawatha +Wants=network-online.target +After=network-online.target + +[Service] +Environment=HOME=%h +Type=oneshot +ExecStart=/usr/bin/lefh renew restart Added: lefh-renew.timer =================================================================== --- lefh-renew.timer (rev 0) +++ lefh-renew.timer 2019-05-12 12:36:33 UTC (rev 466370) @@ -0,0 +1,11 @@ +[Unit] +Description=Daily renewal of Let's Encrypt's certificates + +[Timer] +OnCalendar=daily +# Be kind to the Let's Encrypt servers: add a random delay of 12 hours +RandomizedDelaySec=12h +Persistent=true + +[Install] +WantedBy=timers.target Deleted: letsencrypt-renew.service =================================================================== --- letsencrypt-renew.service 2019-05-12 12:34:41 UTC (rev 466369) +++ letsencrypt-renew.service 2019-05-12 12:36:33 UTC (rev 466370) @@ -1,8 +0,0 @@ -[Unit] -Description=Renew Let's Encrypt certificates -Wants=network-online.target -After=network-online.target - -[Service] -Type=oneshot -ExecStart=/root/letsencrypt/letsencrypt renew restart Deleted: letsencrypt-renew.timer =================================================================== --- letsencrypt-renew.timer 2019-05-12 12:34:41 UTC (rev 466369) +++ letsencrypt-renew.timer 2019-05-12 12:36:33 UTC (rev 466370) @@ -1,11 +0,0 @@ -[Unit] -Description=Daily renewal of Let's Encrypt's certificates - -[Timer] -OnCalendar=daily -# Be kind to the Let's Encrypt servers: add a random delay of 0–3600 seconds -RandomizedDelaySec=3600 -Persistent=true - -[Install] -WantedBy=timers.target
