diff --git a/data/dbus/yggd.conf b/data/dbus/yggd.conf index 678c69e2..fae0a371 100644 --- a/data/dbus/yggd.conf +++ b/data/dbus/yggd.conf @@ -9,10 +9,6 @@ - - - - diff --git a/data/systemd/meson.build b/data/systemd/meson.build index 6e90ca1b..8e6e1cf6 100644 --- a/data/systemd/meson.build +++ b/data/systemd/meson.build @@ -1,5 +1,5 @@ -systemd_system_unit_dir = systemd.get_variable(pkgconfig: 'systemd_system_unit_dir') -systemd_user_unit_dir = systemd.get_variable(pkgconfig: 'systemd_user_unit_dir') +systemd_system_unit_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir') +systemd_user_unit_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir') yggdrasil_service = configure_file( configuration: config_data, diff --git a/meson.build b/meson.build index 0b0752c4..85c1cecc 100644 --- a/meson.build +++ b/meson.build @@ -4,8 +4,8 @@ project('yggdrasil', go = find_program('go') -dbus = dependency('dbus-1', version: '>=1.14') -systemd = dependency('systemd') +dbus = dependency('dbus-1', version: '>=1.12') +systemd = dependency('systemd', version: '>=239') bash_completion = dependency('bash-completion') if get_option('vendor') diff --git a/worker/echo/com.redhat.Yggdrasil1.Worker1.echo.conf b/worker/echo/com.redhat.Yggdrasil1.Worker1.echo.conf new file mode 100644 index 00000000..698dbed2 --- /dev/null +++ b/worker/echo/com.redhat.Yggdrasil1.Worker1.echo.conf @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/worker/echo/com.redhat.Yggdrasil1.Worker1.echo.service.in b/worker/echo/com.redhat.Yggdrasil1.Worker1.echo.service.in index 271a89d3..e332f609 100644 --- a/worker/echo/com.redhat.Yggdrasil1.Worker1.echo.service.in +++ b/worker/echo/com.redhat.Yggdrasil1.Worker1.echo.service.in @@ -1,3 +1,4 @@ [D-BUS Service] Name=com.redhat.Yggdrasil1.Worker1.echo +User=root Exec=@libexecdir@/yggdrasil/echo diff --git a/worker/echo/meson.build b/worker/echo/meson.build index ee5b56a4..74d97a55 100644 --- a/worker/echo/meson.build +++ b/worker/echo/meson.build @@ -13,3 +13,7 @@ configure_file( install: true, install_dir: dbus.get_variable(pkgconfig: 'system_bus_services_dir') ) + +install_data('com.redhat.Yggdrasil1.Worker1.echo.conf', + install_dir: join_paths(dbus.get_variable(pkgconfig: 'datadir'), 'dbus-1', 'system.d') +)