Update to v4.0.1342.

3 files changed, 40 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b409d7d02fb..c83604ce8aa9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = ombi
 	pkgdesc = Simple automated way for users to request new content for Plex
-	pkgver = 3.0.5223
+	pkgver = 4.0.1342
 	pkgrel = 1
-	url = https://github.com/tidusjar/Ombi
+	url = https://github.com/Ombi-app/Ombi
 	arch = x86_64
 	arch = aarch64
 	arch = armv7h
@@ -19,22 +19,24 @@ pkgbase = ombi
 	optdepends = plex-media-server-plexpass: Media server (plexpass version)
 	optdepends = emby-server: Media server
 	replaces = plexrequests
-	noextract = ombi-x86_64-3.0.5223.tar.gz
-	noextract = ombi-i686-3.0.5223.tar.gz
-	noextract = ombi-armv7h-3.0.5223.tar.gz
+	noextract = ombi-x86_64-4.0.1342.tar.gz
+	noextract = ombi-i686-4.0.1342.tar.gz
+	noextract = ombi-armv7h-4.0.1342.tar.gz
+	options = !strip
 	options = staticlibs
+	backup = var/lib/ombi/appsettings.json
 	source = ombi.service
 	source = ombi.sysusers
 	source = ombi.tmpfiles
-	sha256sums = d5893f6b665a0646054343a051e462a49569d51de224b45d3d2542b6c4e3d168
+	sha256sums = f940ba92228b198ffa59603e10e25a3a1958c06207705edcc62b805adfa1a9d4
 	sha256sums = 6efc381990e1113737686d4f61795095fa8edbc176daa877fd755f1ddb3a40fa
 	sha256sums = 49fc5edca9d88fc9d6e9f0f4a6d707b072f32daa097305f0bf905dfff342f44a
-	source_x86_64 = ombi-x86_64-3.0.5223.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v3.0.5223/linux.tar.gz
-	sha256sums_x86_64 = 51ef1e6a5f4ea3a1e16c84e897a0409952b7f948902bf19cb30c83fb714a566a
-	source_aarch64 = ombi-aarch64-3.0.5223.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v3.0.5223/linux-arm64.tar.gz
-	sha256sums_aarch64 = 196ce9b4573e5cff1b86f9262dcaa78980b6773389de47d73dd860baa442aa93
-	source_armv7h = ombi-armv7h-3.0.5223.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v3.0.5223/linux-arm.tar.gz
-	sha256sums_armv7h = 9de774a1049902524f79b182f0f9b8e515ff826a8aa8c2fedf20dc6741391b30
+	source_x86_64 = ombi-x86_64-4.0.1342.tar.gz::https://github.com/Ombi-app/Ombi/releases/download/v4.0.1342/linux-x64.tar.gz
+	sha256sums_x86_64 = d7ca719440b33c2f2b0da62732108c2ac553d08205cd2d90c4b849638ad99f4a
+	source_aarch64 = ombi-aarch64-4.0.1342.tar.gz::https://github.com/Ombi-app/Ombi/releases/download/v4.0.1342/linux-arm64.tar.gz
+	sha256sums_aarch64 = 99d0a3247c33274113c7b0bec600cea8922abdc72be061352e5326ac195fbfd6
+	source_armv7h = ombi-armv7h-4.0.1342.tar.gz::https://github.com/Ombi-app/Ombi/releases/download/v4.0.1342/linux-arm.tar.gz
+	sha256sums_armv7h = 30a61cdd95423941ff974ddd7a8a672a0b613ec012eba76595b354776a2104ea
 
 pkgname = ombi
 
diff --git a/PKGBUILD b/PKGBUILD
index 275f24c6d122..593bd03b357e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Zack Baldwin <zack@zackb.com>
 
 pkgname=ombi
-pkgver=3.0.5223
+pkgver=4.0.1342
 pkgrel=1
-pkgdesc="Simple automated way for users to request new content for Plex"
+pkgdesc='Simple automated way for users to request new content for Plex'
 arch=('x86_64' 'aarch64' 'armv7h')
-url="https://github.com/tidusjar/Ombi"
+url='https://github.com/Ombi-app/Ombi'
 license=('GPL2')
 depends=('libunwind' 'openssl-1.0' 'icu')
 optdepends=('sonarr: TV daemon for usenet & torrents'
@@ -17,36 +17,43 @@ optdepends=('sonarr: TV daemon for usenet & torrents'
             'plex-media-server: Media server'
             'plex-media-server-plexpass: Media server (plexpass version)'
             'emby-server: Media server')
+backup=('var/lib/ombi/appsettings.json')
 replaces=('plexrequests')
-options=('staticlibs')
+options=('!strip' 'staticlibs')
 
-source=("${pkgname}.service"
-        "${pkgname}.sysusers"
-        "${pkgname}.tmpfiles")
+source=("ombi.service"
+        "ombi.sysusers"
+        "ombi.tmpfiles")
 
-source_x86_64=("${pkgname}-x86_64-${pkgver}.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v${pkgver}/linux.tar.gz")
-source_armv7h=("${pkgname}-armv7h-${pkgver}.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v${pkgver}/linux-arm.tar.gz")
-source_aarch64=("${pkgname}-aarch64-${pkgver}.tar.gz::https://github.com/tidusjar/Ombi/releases/download/v${pkgver}/linux-arm64.tar.gz")
+# https://github.com/Ombi-app/Ombi/releases/download/v4.0.1342/linux-x64.tar.gz
+source_x86_64=("ombi-x86_64-${pkgver}.tar.gz::https://github.com/Ombi-app/Ombi/releases/download/v${pkgver}/linux-x64.tar.gz")
+source_armv7h=("ombi-armv7h-${pkgver}.tar.gz::https://github.com/Ombi-app/Ombi/releases/download/v${pkgver}/linux-arm.tar.gz")
+source_aarch64=("ombi-aarch64-${pkgver}.tar.gz::https://github.com/Ombi-app/Ombi/releases/download/v${pkgver}/linux-arm64.tar.gz")
 
-noextract=("${pkgname}-x86_64-${pkgver}.tar.gz"
-           "${pkgname}-i686-${pkgver}.tar.gz"
-           "${pkgname}-armv7h-${pkgver}.tar.gz")
+noextract=("ombi-x86_64-${pkgver}.tar.gz"
+           "ombi-i686-${pkgver}.tar.gz"
+           "ombi-armv7h-${pkgver}.tar.gz")
 
-sha256sums=('d5893f6b665a0646054343a051e462a49569d51de224b45d3d2542b6c4e3d168'
+sha256sums=('f940ba92228b198ffa59603e10e25a3a1958c06207705edcc62b805adfa1a9d4'
             '6efc381990e1113737686d4f61795095fa8edbc176daa877fd755f1ddb3a40fa'
             '49fc5edca9d88fc9d6e9f0f4a6d707b072f32daa097305f0bf905dfff342f44a')
-sha256sums_x86_64=('51ef1e6a5f4ea3a1e16c84e897a0409952b7f948902bf19cb30c83fb714a566a')
-sha256sums_aarch64=('196ce9b4573e5cff1b86f9262dcaa78980b6773389de47d73dd860baa442aa93')
-sha256sums_armv7h=('9de774a1049902524f79b182f0f9b8e515ff826a8aa8c2fedf20dc6741391b30')
+sha256sums_x86_64=('d7ca719440b33c2f2b0da62732108c2ac553d08205cd2d90c4b849638ad99f4a')
+sha256sums_aarch64=('99d0a3247c33274113c7b0bec600cea8922abdc72be061352e5326ac195fbfd6')
+sha256sums_armv7h=('30a61cdd95423941ff974ddd7a8a672a0b613ec012eba76595b354776a2104ea')
 
 prepare() {
   # The source is packaged w/o a sub directory, so create our own and 
   # extract to it. Arm package has a different name too.
   mkdir -p "${srcdir}/ombi"
-  bsdtar -x -C "${srcdir}/ombi" -f "${pkgname}-${CARCH}-${pkgver}.tar.gz"
+  bsdtar -x -C "${srcdir}/ombi" -f "ombi-${CARCH}-${pkgver}.tar.gz"
 }
 
 package() {
+  # Copy the default appsettings.json
+  install -d -m 755 "${pkgdir}/var/lib/ombi"
+  install -D -m 644 "${srcdir}/ombi/appsettings.json" "${pkgdir}/var/lib/ombi/"
+  #install -D -m 644 "${srcdir}/ombi/HealthCheck.css" "${pkgdir}/var/lib/ombi/"
+
   # Copy in files and then fix permissions
   install -d -m 755 "${pkgdir}/usr/lib/ombi"
   cp -dpr --no-preserve=ownership "${srcdir}/ombi/"* "${pkgdir}/usr/lib/ombi/"
diff --git a/ombi.service b/ombi.service
index dd1f60935384..486ec44c5490 100644
--- a/ombi.service
+++ b/ombi.service
@@ -7,7 +7,7 @@ User=ombi
 Group=ombi
 Type=simple
 WorkingDirectory=/usr/lib/ombi
-ExecStart=/usr/lib/ombi/Ombi --storage /var/lib/ombi
+ExecStart=/usr/lib/ombi/Ombi --storage /var/lib/ombi --host http://*:5000
 Restart=always
 TimeoutStopSec=30