Updated package layout.

6 files changed, 50 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6e38165b1cd..11aa31ce9768 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = omada-controller
 	pkgdesc = Centralized EAP controller software
 	pkgver = 3.2.6
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.tp-link.com/support/download/eap-controller/#Controller_Software
 	arch = x86_64
 	license = custom
@@ -10,13 +10,9 @@ pkgbase = omada-controller
 	depends = net-tools
 	provides = eap-controller
 	source = https://static.tp-link.com/2020/202001/20200116/Omada_Controller_v3.2.6_linux_x64.tar.gz
-	source = omada-controller.conf
-	source = omada-controller.hook
-	source = omada-controller.service
+	source = omada-controller-scripts-1.1.2.tar.gz::https://github.com/conqp/omada-controller-scripts/archive/1.1.2.tar.gz
 	sha256sums = bf1fda3e1d882fa15bf8909cb4f2ede5561e5e47d7b02e422524136781aa8b12
-	sha256sums = 529a29bf0caf410380b27a180460078195c3cdb3dfd8df48ac1003538144f353
-	sha256sums = b7cccd06087df2e52815ea3f00b2edf7ab302e362d78edaa61222321fdb41726
-	sha256sums = e790fa28f2946a97cd62590d569d9baf0960755535b92deb7945b6c07ad148b3
+	sha256sums = 1444c2fa29cd68c0acd3464ad0d51dbdd1645da515e79a84ede706f04c82db6e
 
 pkgname = omada-controller
 
diff --git a/.gitignore b/.gitignore
index b4c57b26a5c5..b3b9126dd5ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 src/
 pkg/
-Omada_Controller_v*_linux_x64.tar.gz
 *.pkg.tar*
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index b96f2a858cb3..80b411e01c30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
 
 pkgname='omada-controller'
 pkgver=3.2.6
-pkgrel=2
+_scriptsver=1.1.2
+pkgrel=3
 pkgdesc='Centralized EAP controller software'
 arch=('x86_64')
 url='https://www.tp-link.com/support/download/eap-controller/#Controller_Software'
@@ -11,40 +12,66 @@ depends=('jre8-openjdk' 'java-jsvc' 'net-tools')
 provides=('eap-controller')
 source=(
     "https://static.tp-link.com/2020/202001/20200116/Omada_Controller_v${pkgver}_linux_x64.tar.gz"
-    "${pkgname}.conf"
-    "${pkgname}.hook"
-    "${pkgname}.service"
+    "${pkgname}-scripts-${_scriptsver}.tar.gz::https://github.com/conqp/omada-controller-scripts/archive/${_scriptsver}.tar.gz"
 )
 sha256sums=(
     'bf1fda3e1d882fa15bf8909cb4f2ede5561e5e47d7b02e422524136781aa8b12'
-    '529a29bf0caf410380b27a180460078195c3cdb3dfd8df48ac1003538144f353'
-    'b7cccd06087df2e52815ea3f00b2edf7ab302e362d78edaa61222321fdb41726'
-    'e790fa28f2946a97cd62590d569d9baf0960755535b92deb7945b6c07ad148b3'
+    '1444c2fa29cd68c0acd3464ad0d51dbdd1645da515e79a84ede706f04c82db6e'
 )
 
 
 package() {
     # Install required source files.
     cd "${srcdir}/Omada_Controller_v3.2.6_linux_x64"
-    local BASEDIR="${pkgdir}/var/lib/omada-controller"
+    local BASEDIR="${pkgdir}/opt/omada-controller"
     install -dm 755 "${BASEDIR}"
 
-    for dir in data keystore lib properties webapps; do
-        cp -a "${dir}" "${BASEDIR}/"
+    # Install custom mongodb binary.
+    install -dm 755 "${BASEDIR}/bin"
+    install -m 755 "bin/mongod" "${BASEDIR}/bin/"
+
+    # Install JAR libraries.
+    install -dm 755 "${BASEDIR}/lib"
+
+    for file in lib/*; do
+        install -m 644 "${file}" "${BASEDIR}/lib/"
+    done
+
+    # Install keystore.
+    install -dm 755 "${BASEDIR}/keystore"
+
+    for file in keystore/*; do
+        install -m 644 "${file}" "${BASEDIR}/keystore/"
+    done
+
+    # Install *.properties config files.
+    install -dm 755 "${BASEDIR}/properties"
+
+    for file in properties/*; do
+        install -m 644 "${file}" "${BASEDIR}/properties/"
+    done
+
+    # Install web applications.
+    install -dm 755 "${BASEDIR}/webapps"
+
+    for file in webapps/*; do
+        install -m 644 "${file}" "${BASEDIR}/webapps/"
     done
 
-    # Install custom MongoDB binary.
-    install -Dm 755 bin/mongod "${BASEDIR}/bin/mongod"
+    ### Install scripts ####
 
     # Install systemd units.
-    install -d -m 755 ${pkgdir}/usr/lib/systemd/system
-    install -m 644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/"
+    cd "${srcdir}/omada-controller-scripts-${_scriptsver}"
+    install -dm 755 "${pkgdir}/usr/lib/systemd/system"
+    install -m 644 omada-controller.service "${pkgdir}/usr/lib/systemd/system/"
 
     # Install sysusers configuration.
-    install -d -m 755 "${pkgdir}/usr/lib/sysusers.d"
-    install -m 644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/sysusers.d/"
+    install -dm 755 "${pkgdir}/usr/lib/sysusers.d"
+    install -m 644 "omada-controller.conf" "${pkgdir}/usr/lib/sysusers.d/"
 
-    # Install ALPM hooks.
-    install -d -m 755 "${pkgdir}/usr/share/libalpm/hooks"
-    install -m 644 "${srcdir}/${pkgname}.hook" "${pkgdir}/usr/share/libalpm/hooks/zz-${pkgname}.hook"
+    # Install ALPM hook and script.
+    install -dm 755 "${pkgdir}/usr/share/libalpm/hooks"
+    install -m 644 omada-init-user-dirs.hook "${pkgdir}/usr/share/libalpm/hooks/"
+    install -dm 755 "${pkgdir}/usr/share/libalpm/scripts"
+    install -m 755 omada-init-user-dirs.sh "${pkgdir}/usr/share/libalpm/scripts/omada-init-user-dirs"
 }
diff --git a/omada-controller.conf b/omada-controller.conf
deleted file mode 100644
index 8ee6dc95da7d..000000000000
--- a/omada-controller.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Omada system user account.
-u	omada	-	"Omada Controller user"	/var/lib/omada-controller
diff --git a/omada-controller.hook b/omada-controller.hook
deleted file mode 100644
index f51830948495..000000000000
--- a/omada-controller.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Operation = Install
-Operation = Upgrade
-Type = Package
-Target = omada-controller
-
-[Action]
-Description = Updating ownership of omada controller directories...
-When = PostTransaction
-Exec = /usr/bin/chown -R omada.omada /var/lib/omada-controller
diff --git a/omada-controller.service b/omada-controller.service
deleted file mode 100644
index 953369118438..000000000000
--- a/omada-controller.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Omada EAP Controller
-After=network.target
-
-[Service]
-Type=forking
-User=omada
-Group=omada
-WorkingDirectory=/var/lib/omada-controller
-PIDFile=/run/omada-controller.pid
-ExecStartPre=!/usr/bin/touch /run/omada-controller.pid
-ExecStartPre=!/usr/bin/chown omada.omada /run/omada-controller.pid
-ExecStart=/usr/bin/jsvc -pidfile /run/omada-controller.pid -home /usr/lib/jvm/java-8-openjdk/jre -cp /usr/share/java/commons-daemon.jar:/var/lib/omada-controller/lib/* -outfile SYSLOG -errfile SYSLOG -procname omada-controller -showversion -server -Xms128m -Xmx1024m -XX:MaxHeapFreeRatio=60 -XX:MinHeapFreeRatio=30 -XX:+HeapDumpOnOutOfMemoryError -Deap.home=/var/lib/omada-controller com.tp_link.eap.start.EapLinuxMain start
-ProtectHome=true
-
-[Install]
-WantedBy=multi-user.target