diff --git a/testing/grommunio-common/APKBUILD b/testing/grommunio-common/APKBUILD index b212594d24c..1334c144975 100644 --- a/testing/grommunio-common/APKBUILD +++ b/testing/grommunio-common/APKBUILD @@ -2,7 +2,7 @@ pkgname=grommunio-common pkgdesc="Common configuration package for grommunio" pkgver=1.0 -pkgrel=0 +pkgrel=1 arch="noarch !riscv64" url="https://grommunio.com/" license="AGPL-3.0-only" @@ -12,8 +12,9 @@ subpackages="$pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/configs/archive/refs/tags/v$pkgver.tar.gz 0001-redis-grommunio.patch - grommunio@redis.initd - grommunio@redis.confd + ssl_certificate.conf + redis@grommunio.initd + redis@grommunio.confd " builddir="$srcdir/configs-$pkgver" @@ -22,9 +23,16 @@ package() { mkdir -p "$pkgdir" cp -rp -- * "$pkgdir" + # service files install -dm755 "$pkgdir"/etc/init.d/ - ln -sf "/etc/init.d/redis" "$pkgdir/etc/init.d/grommunio@redis" - install -Dm644 "$srcdir"/grommunio@redis.confd "$pkgdir"/etc/conf.d/grommunio@redis + ln -sf "/etc/init.d/redis" "$pkgdir/etc/init.d/redis@grommunio" + install -Dm644 "$srcdir"/redis@grommunio.confd "$pkgdir"/etc/conf.d/redis@grommunio + + # fix nginx directory + mv "$pkgdir/etc/nginx/conf.d" "$pkgdir/etc/nginx/http.d" + + # nginx config file + install -m644 -D "$srcdir"/ssl_certificate.conf "$pkgdir"/etc/grommunio-common/nginx/ssl_certificate.conf # remove unnecessary files rm -rf "$pkgdir/etc/zypp" @@ -33,6 +41,7 @@ package() { sha512sums=" 1e2db173a73012948be3b829919ab3092ba0399228355d7a157398bb5b4b9d6c4150b1f2aaf38cfb857dba710765408a54cf2aab09e369c28d1971a29f221b26 grommunio-common-1.0.tar.gz 89bad8ea9d28bab8815cf57c8539b49a7d1e59b01409b89539a863e74ca90d8def8a89dc5bed19bf99c0fc38a3ba45707ad33386ed94412403a779e5c71a1831 0001-redis-grommunio.patch -5aa23f4ad715bfc9cf0b8b020b55a3802aedaab0e813250a0fcf50ffa5d792c3c04d1ceb2985cf5d5be71f078b6c5704232ee5a0f891826536f72ba494e57e03 grommunio@redis.initd -1412f11520c5ebce4bdd491e6fe34254fc0e36f79acaae0d1495e77ad2fe799ec6b135d28b92aa68f3486d8ecd329e462230bc2d447aac1353226b8c28b49ccf grommunio@redis.confd +e2d1a010813078651ca2e728589a1c0c84b6e098c87f59b2ec07d54a9f80b8c9a2168cd853dd73fe07ee6e05cc66f762c2d9ba2511c135314bb1727f6cbfba91 ssl_certificate.conf +5aa23f4ad715bfc9cf0b8b020b55a3802aedaab0e813250a0fcf50ffa5d792c3c04d1ceb2985cf5d5be71f078b6c5704232ee5a0f891826536f72ba494e57e03 redis@grommunio.initd +1412f11520c5ebce4bdd491e6fe34254fc0e36f79acaae0d1495e77ad2fe799ec6b135d28b92aa68f3486d8ecd329e462230bc2d447aac1353226b8c28b49ccf redis@grommunio.confd " diff --git a/testing/grommunio-common/redis@grommunio.confd b/testing/grommunio-common/redis@grommunio.confd new file mode 100644 index 00000000000..b31955502ee --- /dev/null +++ b/testing/grommunio-common/redis@grommunio.confd @@ -0,0 +1,7 @@ +# Configuration for /etc/init.d/grommunio@redis + +# User (and group) to run redis as +#command_user="redis:redis" + +# Configuration file +cfgfile="/etc/redis/grommunio.conf" diff --git a/testing/grommunio-common/redis@grommunio.initd b/testing/grommunio-common/redis@grommunio.initd new file mode 100644 index 00000000000..e76026b945d --- /dev/null +++ b/testing/grommunio-common/redis@grommunio.initd @@ -0,0 +1,3 @@ +#!/sbin/openrc-run + +# dummy init file which is overwritten with symlink to redis diff --git a/testing/grommunio-common/ssl_certificate.conf b/testing/grommunio-common/ssl_certificate.conf new file mode 100644 index 00000000000..59a08477a88 --- /dev/null +++ b/testing/grommunio-common/ssl_certificate.conf @@ -0,0 +1,2 @@ +ssl_certificate /etc/ssl/certs/mail.example.local.cert.pem; +ssl_certificate_key /etc/ssl/private/mail.example.local.key.pem;