starlingx/monitoring
Code Issues Proposed changes

Merge "Adjusting paths due to apt-ostree restrictions"

Browse Source
This commit is contained in:
Zuul 2025-01-21 17:48:39 +00:00 committed by Gerrit Code Review
commit 942fb061a2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
collectd-extensions/debian/deb_folder/collectd-extensions-tmpfiles.conf Normal file
View File

@ -0,0 +1 @@
L /opt/collectd - - - - /usr/rootdirs/opt/collectd

5
collectd-extensions/debian/deb_folder/collectd-extensions.install
View File

@ -1,6 +1,7 @@
etc/collectd.d/* etc/collectd.d/*
opt/collectd/extensions/config/* etc/tmpfiles.d/collectd-extensions-tmpfiles.conf
opt/collectd/extensions/python/* usr/rootdirs/opt/collectd/extensions/config/*
usr/rootdirs/opt/collectd/extensions/python/*
# %config(noreplace) # %config(noreplace)
etc/systemd/system/collectd.service etc/systemd/system/collectd.service

8
collectd-extensions/debian/deb_folder/rules
View File

@ -4,13 +4,17 @@ export ROOT = $(CURDIR)/debian/tmp
export LOCAL_UNIT_DIR = $(ROOT)/etc/systemd/system export LOCAL_UNIT_DIR = $(ROOT)/etc/systemd/system
export LOCAL_DEFAULT_PLUGIN_DIR = $(ROOT)/etc/collectd.d export LOCAL_DEFAULT_PLUGIN_DIR = $(ROOT)/etc/collectd.d
export LOCAL_STARLINGX_PLUGIN_DIR = $(ROOT)/etc/collectd.d/starlingx export LOCAL_STARLINGX_PLUGIN_DIR = $(ROOT)/etc/collectd.d/starlingx
export LOCAL_PYTHON_EXTENSIONS_DIR = $(ROOT)/opt/collectd/extensions/python export LOCAL_PYTHON_EXTENSIONS_DIR = $(ROOT)/usr/rootdirs/opt/collectd/extensions/python
export LOCAL_CONFIG_EXTENSIONS_DIR = $(ROOT)/opt/collectd/extensions/config export LOCAL_CONFIG_EXTENSIONS_DIR = $(ROOT)/usr/rootdirs/opt/collectd/extensions/config
export TMPFILES_DIR = $(ROOT)/etc/tmpfiles.d/
%: %:
dh $@ dh $@
override_dh_install: override_dh_install:
# Set up symlink /opt/collectd->/usr/rootdirs/opt/collectd
install -d $(TMPFILES_DIR)
install -m 644 debian/collectd-extensions-tmpfiles.conf $(TMPFILES_DIR)
# Adjustments in the configuration files for debian # Adjustments in the configuration files for debian
sed -i '/Encoding "utf-8"/D' python_plugins.conf sed -i '/Encoding "utf-8"/D' python_plugins.conf