Move all sql files to a separate directory

[Issue#]       SSDWSSP-615
[Bug/Feature]  Sql scripts were added to /usr/share/privilege-control,
               which is not the best place, as lots of .rule files are
               located in that directory.
[Solution]     Move them to subdirectory db.
[Veryfication] Build, install, run tests.

Change-Id: I4f9db8b8fe2a7e3bbf1d37cc2df4ca650493ce3d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d271576..0f72005 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,10 +96,10 @@ INSTALL(FILES .privilege_control_app_gids.db DESTINATION /opt/dbspace)
 #INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/udev/ DESTINATION lib/udev)
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/slp-su DESTINATION bin)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/rules-db.sql DESTINATION /usr/share/privilege-control)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/rules-db-data.sql DESTINATION /usr/share/privilege-control)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/db/updates/ DESTINATION /usr/share/privilege-control/updates)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/updater.sh DESTINATION /usr/share/privilege-control
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/rules-db.sql DESTINATION /usr/share/privilege-control/db)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/rules-db-data.sql DESTINATION /usr/share/privilege-control/db)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/db/updates/ DESTINATION /usr/share/privilege-control/db/updates)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/updater.sh DESTINATION /usr/share/privilege-control/db
      PERMISSIONS OWNER_READ
                  OWNER_WRITE
                  OWNER_EXECUTE
@@ -109,7 +109,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/updater.sh DESTINATION /usr/share/p
                  WORLD_READ
                  WORLD_WRITE
                  WORLD_EXECUTE)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/load-rules-db.sql DESTINATION /usr/share/privilege-control)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/load-rules-db.sql DESTINATION /usr/share/privilege-control/db)
 
 
 INSTALL(FILES ${PROJECT_SOURCE_DIR}/smack-rules.service

diff --git a/db/updater.sh b/db/updater.sh
index 2e11d1c..cddd73f 100755 (executable)
--- a/db/updater.sh
+++ b/db/updater.sh
@@ -20,8 +20,8 @@ fi
 
 
 database="$dir/opt/dbspace/.rules-db.db3"
-scripts_dir="$dir/usr/share/privilege-control"
-updates_dir="$dir/usr/share/privilege-control/updates"
+scripts_dir="$dir/usr/share/privilege-control/db"
+updates_dir="$dir/usr/share/privilege-control/db/updates"
 
 echo $database
 

diff --git a/packaging/libprivilege-control.spec b/packaging/libprivilege-control.spec
index 471f29c..ae1da26 100644 (file)
--- a/packaging/libprivilege-control.spec
+++ b/packaging/libprivilege-control.spec
@@ -100,7 +100,7 @@ then
        mkdir -p /opt/etc/smack-app-early/accesses.d
 fi
 
-/usr/share/privilege-control/updater.sh
+/usr/share/privilege-control/db/updater.sh
 
 api_feature_loader --verbose --dir=/usr/share/privilege-control/
 api_feature_loader --verbose --rules=/usr/share/privilege-control/ADDITIONAL_RULES.smack
@@ -120,11 +120,11 @@ api_feature_loader --verbose --rules=/usr/share/privilege-control/ADDITIONAL_RUL
 /usr/bin/api_feature_loader
 #link to activate systemd service
 /usr/lib/systemd/system/multi-user.target.wants/smack-rules.service
-/usr/share/privilege-control/rules-db.sql
-/usr/share/privilege-control/rules-db-data.sql
-/usr/share/privilege-control/updater.sh
-/usr/share/privilege-control/updates/*
-/usr/share/privilege-control/load-rules-db.sql
+/usr/share/privilege-control/db/rules-db.sql
+/usr/share/privilege-control/db/rules-db-data.sql
+/usr/share/privilege-control/db/updater.sh
+/usr/share/privilege-control/db/updates/*
+/usr/share/privilege-control/db/load-rules-db.sql
 
 %files conf
 /etc/group

diff --git a/smack-rules.service b/smack-rules.service
index c4130fe..25db3d6 100644 (file)
--- a/smack-rules.service
+++ b/smack-rules.service
@@ -4,7 +4,7 @@ Before=starter.service
 
 [Service]
 Type=oneshot
-ExecStartPre =  /bin/bash -c '/usr/bin/sqlite3 /opt/dbspace/.rules-db.db3 < /usr/share/privilege-control/smack/load-rules-db.sql'
+ExecStartPre =  /bin/bash -c '/usr/bin/sqlite3 /opt/dbspace/.rules-db.db3 < /usr/share/privilege-control/db/load-rules-db.sql'
 ExecStart = /bin/bash -c '/bin/grep ^ /opt/etc/smack/boot-rules.smack --line-buffered > /smack/change-rule'
 
 [Install]