From 481b5c65fa752406c77daa016d6d0f3f1daea4e4 Mon Sep 17 00:00:00 2001
From: Michal Vasko <mvasko@cesnet.cz>
Date: Tue, 16 Jan 2024 11:35:51 +0100
Subject: [PATCH] distro UPDATE latest file changes

---
 distro/pkg/deb/netopeer2.install  |  3 ++-
 distro/pkg/deb/netopeer2.postinst |  6 +++---
 distro/pkg/deb/netopeer2.prerm    |  2 +-
 distro/pkg/rpm/netopeer2.spec     | 11 ++++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/distro/pkg/deb/netopeer2.install b/distro/pkg/deb/netopeer2.install
index d8fc4bcc..d2e92a8b 100644
--- a/distro/pkg/deb/netopeer2.install
+++ b/distro/pkg/deb/netopeer2.install
@@ -4,4 +4,5 @@ usr/share/man/man1/netopeer2-cli.1
 usr/share/man/man8/netopeer2-server.8
 usr/lib/systemd/system/netopeer2-server.service
 usr/share/yang/modules/netopeer2
-usr/share/netopeer2
+usr/share/netopeer2/scripts
+etc/pam.d/netopeer2.conf
diff --git a/distro/pkg/deb/netopeer2.postinst b/distro/pkg/deb/netopeer2.postinst
index 5288a915..af31cef5 100755
--- a/distro/pkg/deb/netopeer2.postinst
+++ b/distro/pkg/deb/netopeer2.postinst
@@ -29,14 +29,14 @@ case "$1" in
 	    NP2_MODULE_PERMS=660 \
 	    NP2_MODULE_OWNER=root \
 	    NP2_MODULE_GROUP=netconf \
-	    bash /usr/share/netopeer2/setup.sh
+	    bash /usr/share/netopeer2/scripts/setup.sh
 	env - \
 	    SYSREPOCFG_EXECUTABLE=sysrepocfg \
 	    OPENSSL_EXECUTABLE=openssl \
-	bash /usr/share/netopeer2/merge_hostkey.sh
+	bash /usr/share/netopeer2/scripts/merge_hostkey.sh
 	env - \
 	    SYSREPOCFG_EXECUTABLE=sysrepocfg \
-	bash /usr/share/netopeer2/merge_config.sh
+	bash /usr/share/netopeer2/scripts/merge_config.sh
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/distro/pkg/deb/netopeer2.prerm b/distro/pkg/deb/netopeer2.prerm
index 91105a95..bfe5a033 100755
--- a/distro/pkg/deb/netopeer2.prerm
+++ b/distro/pkg/deb/netopeer2.prerm
@@ -34,7 +34,7 @@ case "$1" in
 	    NP2_MODULE_PERMS=660 \
 	    NP2_MODULE_OWNER=root \
 	    NP2_MODULE_GROUP=netconf \
-	    bash /usr/share/netopeer2/remove.sh
+	    bash /usr/share/netopeer2/scripts/remove.sh
     ;;
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
diff --git a/distro/pkg/rpm/netopeer2.spec b/distro/pkg/rpm/netopeer2.spec
index 563725b1..b8b64933 100644
--- a/distro/pkg/rpm/netopeer2.spec
+++ b/distro/pkg/rpm/netopeer2.spec
@@ -80,15 +80,15 @@ export NP2_MODULE_PERMS=600
 export NP2_MODULE_OWNER=root
 export LN2_MODULE_DIR=%{_datadir}/yang/modules/libnetconf2
 
-%{_datadir}/netopeer2/setup.sh
-%{_datadir}/netopeer2/merge_hostkey.sh
-%{_datadir}/netopeer2/merge_config.sh
+%{_datadir}/netopeer2/scripts/setup.sh
+%{_datadir}/netopeer2/scripts/merge_hostkey.sh
+%{_datadir}/netopeer2/scripts/merge_config.sh
 
 %systemd_post netopeer2-server.service
 
 %preun server
 set -e
-%{_datadir}/netopeer2/remove.sh
+%{_datadir}/netopeer2/scripts/remove.sh
 
 
 %files
@@ -100,7 +100,8 @@ set -e
 %{_datadir}/man/man8/netopeer2-server.8.gz
 %{_unitdir}/netopeer2-server.service
 %{_datadir}/yang/modules/netopeer2/*.yang
-%{_datadir}/netopeer2/*.sh
+%{_datadir}/netopeer2/scripts/*.sh
+%{_sysconfdir}/pam.d/netopeer2.conf
 %dir %{_datadir}/yang/modules/netopeer2/
 %dir %{_datadir}/netopeer2/
 %dir %{_libdir}/netopeer2-server/