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

hirte config files should be called the same everywhere #253

Merged
merged 1 commit into from
May 10, 2023
Merged

hirte config files should be called the same everywhere #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion config/agent/agent.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This is the configuration file for hirte-agent.
#
# All available options are described in hirte-agent.conf man page or in
# hirte-default.conf file provided by hirte-agent package.
# agent.conf file provided by hirte-agent package.
#

[hirte-agent]
Expand Down
40 changes: 0 additions & 40 deletions config/agent/hirte-default.conf
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions config/hirte/hirte-default.conf
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions config/hirte/hirte.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This is the configuration file for hirte manager.
#
# All available options are described in hirte.conf man page or in
# hirte-default.conf file provided by hirte package.
# All available options are described in hirte.conf man page file provided by hirte package.
#

[hirte]
Expand Down
7 changes: 3 additions & 4 deletions config/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
# SPDX-License-Identifier: GPL-2.0-or-later

install_data(
['hirte/hirte.conf', 'agent/agent.conf'],
install_dir : get_option('sysconfdir') / 'hirte'
)

install_data(
'agent/hirte-default.conf',
'agent/agent.conf',
install_dir : join_paths(get_option('datadir'), 'hirte-agent', 'config')
)

install_data(
'hirte/hirte-default.conf',
'hirte/hirte.conf',
install_dir : join_paths(get_option('datadir'), 'hirte', 'config')
)

Expand All @@ -23,4 +22,4 @@ install_data(
install_data(
'hirte.conf.d/README.md',
install_dir : join_paths(get_option('sysconfdir') / 'hirte' / 'hirte.conf.d')
)
)
6 changes: 4 additions & 2 deletions doc/man/hirte-agent.conf.5.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## NAME

hirte-agent.conf - Configuration file to bootstrap hirte-agent
agent.conf - Configuration file to bootstrap hirte-agent

## DESCRIPTION

Expand Down Expand Up @@ -92,7 +92,9 @@ LogIsQuiet=false
```
## FILES

Distributions provide the __/usr/share/hirte-agent/config/hirte-default.conf__ file which defines hirte-agent configuration defaults. Administrators can copy this file to __/etc/hirte/agent.conf__ and specify their own configuration.
Distributions provide the __/usr/share/hirte/config/agent.conf__ file which defines hirte-agent configuration defaults. Administrators can copy this file to __/etc/hirte/agent.conf__ and specify their own configuration.

Administrators can also use a "drop-in" directory __/etc/hirte/agent.conf.d__ to drop their configuration changes.

## SEE ALSO

Expand Down
7 changes: 7 additions & 0 deletions doc/man/hirte.conf.5.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ LogTarget=journald
LogIsQuiet=false
```

## FILES

Distributions provide the __/usr/share/hirte/config/hirte.conf__ file which defines hirte configuration defaults. Administrators can copy this file to __/etc/hirte/hirte.conf__ and specify their own configuration.

Administrators can also use a "drop-in" directory __/etc/hirte/hirte.conf.d__ to drop their configuration changes.


## SEE ALSO

**[hirte(1)](https://github.com/containers/hirte/blob/main/doc/man/hirte.1.md)**
8 changes: 4 additions & 4 deletions hirte.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ This package contains the controller and command line tool.
%systemd_postun_with_restart hirte.service

%files
%config(noreplace) %{_sysconfdir}/hirte/hirte.conf
%ghost %{_sysconfdir}/hirte/hirte.conf
%dir %{_sysconfdir}/hirte
%dir %{_sysconfdir}/hirte/hirte.conf.d
%doc README.md
Expand All @@ -43,7 +43,7 @@ This package contains the controller and command line tool.
%{_datadir}/dbus-1/interfaces/org.containers.hirte.Monitor.xml
%{_datadir}/dbus-1/interfaces/org.containers.hirte.Node.xml
%{_datadir}/dbus-1/system.d/org.containers.hirte.conf
%{_datadir}/hirte/config/hirte-default.conf
%{_datadir}/hirte/config/hirte.conf
%{_mandir}/man1/hirte.*
%{_mandir}/man5/hirte.conf.*
%{_sysconfdir}/hirte/hirte.conf.d/README.md
Expand Down Expand Up @@ -71,15 +71,15 @@ This package contains the node agent.
%systemd_postun_with_restart hirte-agent.service

%files agent
%config(noreplace) %{_sysconfdir}/hirte/agent.conf
%ghost %{_sysconfdir}/hirte/agent.conf
%dir %{_sysconfdir}/hirte
%dir %{_sysconfdir}/hirte/agent.conf.d
%doc README.md
%license LICENSE
%{_bindir}/hirte-agent
%{_bindir}/hirte-proxy
%{_datadir}/dbus-1/system.d/org.containers.hirte.Agent.conf
%{_datadir}/hirte-agent/config/hirte-default.conf
%{_datadir}/hirte-agent/config/agent.conf
%{_datadir}/dbus-1/interfaces/org.containers.hirte.Agent.xml
%{_mandir}/man1/hirte-agent.*
%{_mandir}/man1/hirte-proxy.*
Expand Down
4 changes: 2 additions & 2 deletions src/libhirte/common/cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ typedef struct config config;
*/
#define CFG_ETC_HIRTE_CONF CONFIG_H_SYSCONFDIR "/hirte/hirte.conf"
#define CFG_ETC_HIRTE_AGENT_CONF CONFIG_H_SYSCONFDIR "/hirte/agent.conf"
#define CFG_AGENT_DEFAULT_CONFIG CONFIG_H_DATADIR "/hirte-agent/config/hirte-default.conf"
#define CFG_HIRTE_DEFAULT_CONFIG CONFIG_H_DATADIR "/hirte/config/hirte-default.conf"
#define CFG_AGENT_DEFAULT_CONFIG CONFIG_H_DATADIR "/hirte-agent/config/agent.conf"
#define CFG_HIRTE_DEFAULT_CONFIG CONFIG_H_DATADIR "/hirte/config/hirte.conf"
#define CFG_ETC_AGENT_CONF_DIR CONFIG_H_SYSCONFDIR "/hirte/agent.conf.d"
#define CFG_ETC_HIRTE_CONF_DIR CONFIG_H_SYSCONFDIR "/hirte/hirte.conf.d"

Expand Down