diff options
| author | Achmad Fathoni | 2023-05-14 22:02:03 +0900 |
|---|---|---|
| committer | Achmad Fathoni | 2023-05-14 22:02:03 +0900 |
| commit | 36982f5473cba97e9078b150632cd08009f7218c (patch) | |
| tree | eacc9dfd1131ebd05707bd9148d12af74214aa7f | |
| parent | 5f5c080aa63ff7c7d4021537bd2e6b7f4600a496 (diff) | |
| download | aur-36982f5473cba97e9078b150632cd08009f7218c.tar.gz | |
update service
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | geoserver.service | 1 |
3 files changed, 9 insertions, 6 deletions
@@ -13,7 +13,7 @@ pkgbase = geoserver-bin source = geoserver.sysusers sha256sums = aa847253e759ae060a6bab6a7b5de71c969c3a536248cb82102b5f305c6ed558 sha256sums = 576c36670c418aa25730986e592c8b0f4a0657d3129aafbe7c783ff3ed527abe - sha256sums = b746621be690e385341a41d850cd297e6c70e936024e6eea43f98022e53cb301 + sha256sums = 8a785d95da48d4a97d9f3620256b2a7fe607680dc932b5ee2dbcd6473352d126 sha256sums = edd692b53b71a684b20e0e7a87b0047aaefc2286574355fb5c08770af2652d08 pkgname = geoserver-bin @@ -12,7 +12,8 @@ pkgdesc="Server written in Java that allows users to share and edit geospatial d arch=("any") url="http://geoserver.org" license=("GPL2+") -depends=("jre17-openjdk-headless") +java_ver=17 +depends=("jre${java_ver}-openjdk-headless") source=( @@ -23,7 +24,7 @@ source=( ) sha256sums=('aa847253e759ae060a6bab6a7b5de71c969c3a536248cb82102b5f305c6ed558' '576c36670c418aa25730986e592c8b0f4a0657d3129aafbe7c783ff3ed527abe' - 'b746621be690e385341a41d850cd297e6c70e936024e6eea43f98022e53cb301' + '8a785d95da48d4a97d9f3620256b2a7fe607680dc932b5ee2dbcd6473352d126' 'edd692b53b71a684b20e0e7a87b0047aaefc2286574355fb5c08770af2652d08') install="geoserver.install" @@ -52,6 +53,7 @@ package() { # install geoserver as a systemd service sed "s/{pkgver}/${pkgver}/g" -i ../geoserver.service + sed "s/{java_ver}/${java_ver}/g" -i ../geoserver.service install -Dm644 ../geoserver.service "${pkgdir}/usr/lib/systemd/system/geoserver.service" # custom startup/shutdown links @@ -65,7 +67,7 @@ package() { echo "export GEOSERVER_HOME=/opt/geoserver/${pkgver}/" > "${pkgdir}/etc/profile.d/geoserver.sh" chmod +x "${pkgdir}/etc/profile.d/geoserver.sh" - # install geoserver as a systemd service - sed "s/{pkgver}/${pkgver}/g" -i ../geoserver.service - install -Dm644 ../geoserver.service "${pkgdir}/usr/lib/systemd/system/geoserver.service" + # Fix marlin + # https://docs.geoserver.org/latest/en/user/production/java.html#running-on-java-17 + rm "${pkgdir}/opt/geoserver/${pkgver}/webapps/geoserver/WEB-INF/lib/marlin-0.9.3.jar" } diff --git a/geoserver.service b/geoserver.service index 5666d4a0a298..68a5c636d6b5 100644 --- a/geoserver.service +++ b/geoserver.service @@ -8,6 +8,7 @@ User=geoserver Group=geoserver Environment="GEOSERVER_HOME=/opt/geoserver/{pkgver}/" +Environment="JAVA_HOME=/usr/lib/jvm/java-{java_ver}-openjdk" ExecStart=/opt/geoserver/{pkgver}/bin/startup.sh ExecStop=/opt/geoserver/{pkgver}/bin/shutdown.sh RemainAfterExit=yes |