Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use a saner default for GVM_FEED_LOCK_PATH #1665

Merged
merged 2 commits into from
Aug 19, 2021
Merged

Use a saner default for GVM_FEED_LOCK_PATH #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dedbb6
Use a saner default for GVM_FEED_LOCK_PATH
bjoernricks Aug 5, 2021
d08885d
Update CHANGELOG
bjoernricks Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [20.8.4] - Unreleased
### Added
### Changed
* Changed defaults for installation locations [#1662](https://github.com/greenbone/gvmd/pull/1662)
* Changed defaults for installation locations [#1662](https://github.com/greenbone/gvmd/pull/1662) [#1665](https://github.com/greenbone/gvmd/pull/1665)
* SYSCONFDIR is /etc by default now
* LOCALSTATEDIR is /var by default now
* GVM_RUN_DIR is /run/gvm by default now
* OPENVAS_DEFAULT_SOCKET is /run/ospd/ospd-openvas.sock by default now
* SYSTEMD_SERVICE_DIR is /lib/systemd/system by default now
* Removed gvmd.default file and adjusted gvmd.service file accordingly
* GVM_FEED_LOCK_PATH is /var/lib/gvm/feed-update.lock by default now

### Deprecated
### Removed
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ if (NOT GVM_RUN_DIR)
endif (NOT GVM_RUN_DIR)

if (NOT GVM_FEED_LOCK_PATH)
set (GVM_FEED_LOCK_PATH "${GVM_RUN_DIR}/feed-update.lock")
set (GVM_FEED_LOCK_PATH "${GVM_STATE_DIR}/feed-update.lock")
endif (NOT GVM_FEED_LOCK_PATH)
add_definitions (-DGVM_FEED_LOCK_PATH="${GVM_FEED_LOCK_PATH}")

Expand Down