Merge pull request #828 from greenbone/mergify/bp/openvas-21.04/pr-826

Changed defaults for installation locations (backport #826)

CHANGELOG.md

@@ -4,19 +4,24 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased]
+## [21.4.3] - Unreleased
 ### Added
 ### Changed
 ### Deprecated
 ### Removed
 ### Fixed
 
-[Unreleased]: https://github.com/greenbone/openvas-scanner/compare/v21.4.2...HEAD
-
+[21.4.3]: https://github.com/greenbone/openvas-scanner/compare/v21.4.2...gvmd-21.04
 
 ## [21.4.2] - 2021-08-03
+### Fixed
+- Fix clang-analyzer warnings.
+  [#791](https://github.com/greenbone/openvas/pull/791)
+  [#795](https://github.com/greenbone/openvas/pull/795)
+
 [21.4.2]: https://github.com/greenbone/openvas-scanner/compare/v21.4.1...v21.4.2
 
+
 ## [21.4.1] - 2021-06-23
 
 ### Added
@@ -61,34 +66,37 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [21.4.0]: https://github.com/greenbone/openvas/compare/openvas-20.08...v21.4.0
 
 
-## [Unreleased]
+## [20.8.4]
 ### Added
 ### Changed
+- Changed defaults for installation locations [#826](https://github.com/greenbone/openvas-scanner/pull/826)
+  - SYSCONFDIR is /etc by default now
+  - LOCALSTATEDIR is /var by default now
+  - OPENVAS_RUN_DIR is /run/ospd by default now
+  - OPENVAS_FEED_LOOK_PATH is /var/lib/openvas/feed-update.lock by default now
+
 ### Deprecated
 ### Removed
 ### Fixed
 
-[Unreleased]: https://github.com/greenbone/openvas-scanner/compare/v21.4.2...HEAD
-
+[20.8.4]: https://github.com/greenbone/openvas-scanner/compare/v20.8.3...openvas-20.08
 
-## [21.4.2] - 2021-08-03
-## [20.8.3] - Unreleased - 2021-08-03### Fixed
+## [20.8.3] - 2021-08-03
+### Fixed
 
 - Fix clang-analyzer warnings.
   [#791](https://github.com/greenbone/openvas/pull/791)
   [#795](https://github.com/greenbone/openvas/pull/795)
 
 [20.8.3]: https://github.com/greenbone/openvas/compare/v20.8.2...openvas-20.08
 
-[21.4.2]: https://github.com/greenbone/openvas-scanner/compare/v21.4.1...v21.4.2
-
 ## [20.8.2] - 2021-06-23
 
 ### Added
 - Check for wrong names or values in the script_xrefs params.
   [#650](https://github.com/greenbone/openvas/pull/650)
   [#653](https://github.com/greenbone/openvas/pull/653)
-- Log a message if the scanner did not launch all plugins against a host. 
+- Log a message if the scanner did not launch all plugins against a host.
   [#700](https://github.com/greenbone/openvas/pull/700)
   [#734](https://github.com/greenbone/openvas/pull/734)
 

CMakeLists.txt

@@ -113,7 +113,7 @@ if (SYSCONF_INSTALL_DIR)
 endif (SYSCONF_INSTALL_DIR)
 
 if (NOT SYSCONFDIR)
-  set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
+  set (SYSCONFDIR "/etc")
 endif (NOT SYSCONFDIR)
 
 if (NOT EXEC_PREFIX)
@@ -142,24 +142,25 @@ if (NOT LIBDIR)
 endif (NOT LIBDIR)
 
 if (NOT LOCALSTATEDIR)
-  set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var")
+  set (LOCALSTATEDIR "/var")
 endif (NOT LOCALSTATEDIR)
 
 if (NOT DATADIR)
   set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
 endif (NOT DATADIR)
 
 if (NOT OPENVAS_RUN_DIR)
-  set (OPENVAS_RUN_DIR "${LOCALSTATEDIR}/run")
+  set (OPENVAS_RUN_DIR "/run/ospd")
 endif (NOT OPENVAS_RUN_DIR)
 
+set (OPENVAS_DATA_DIR    "${DATADIR}/openvas")
+set (OPENVAS_STATE_DIR   "${LOCALSTATEDIR}/lib/openvas")
+
 if (NOT OPENVAS_FEED_LOCK_PATH)
-  set (OPENVAS_FEED_LOCK_PATH "${OPENVAS_RUN_DIR}/feed-update.lock")
+  set (OPENVAS_FEED_LOCK_PATH "${OPENVAS_STATE_DIR}/feed-update.lock")
 endif (NOT OPENVAS_FEED_LOCK_PATH)
 add_definitions (-DOPENVAS_FEED_LOCK_PATH="${OPENVAS_FEED_LOCK_PATH}")
 
-set (OPENVAS_DATA_DIR    "${DATADIR}/openvas")
-set (OPENVAS_STATE_DIR   "${LOCALSTATEDIR}/lib/openvas")
 if (NOT GVM_LOG_DIR)
 	set (GVM_LOG_DIR         "${LOCALSTATEDIR}/log/gvm")
 endif (NOT GVM_LOG_DIR)