diff --git a/systemd-config/centos/systemd-config.spec b/systemd-config/centos/systemd-config.spec index e5d803c..705928b 100644 --- a/systemd-config/centos/systemd-config.spec +++ b/systemd-config/centos/systemd-config.spec @@ -39,6 +39,7 @@ install -d %{buildroot}%{local_systemd_system} install -m644 60-persistent-storage.rules %{buildroot}%{local_udev_rules_d}/60-persistent-storage.rules install -m644 journald.conf %{buildroot}%{_datadir}/starlingx/journald.conf +install -m644 kubernetes.conf.tmpfiles.d %{buildroot}%{local_tmpfiles_d}/kubernetes.conf install -m644 systemd.conf.tmpfiles.d %{buildroot}%{local_tmpfiles_d}/systemd.conf install -m644 tmp.conf.tmpfiles.d %{buildroot}%{local_tmpfiles_d}/tmp.conf install -m644 tmp.mount %{buildroot}%{local_systemd_system}/tmp.mount @@ -54,6 +55,7 @@ fi %license LICENSE %{local_udev_rules_d}/60-persistent-storage.rules %{_datadir}/starlingx/journald.conf +%{local_tmpfiles_d}/kubernetes.conf %{local_tmpfiles_d}/systemd.conf %{local_tmpfiles_d}/tmp.conf %{local_systemd_system}/tmp.mount diff --git a/systemd-config/debian/deb_folder/systemd-config.install b/systemd-config/debian/deb_folder/systemd-config.install index da69b30..933dfd2 100644 --- a/systemd-config/debian/deb_folder/systemd-config.install +++ b/systemd-config/debian/deb_folder/systemd-config.install @@ -1,5 +1,6 @@ 60-persistent-storage.rules usr/lib/udev/rules.d journald.conf usr/share/starlingx +kubernetes.conf etc/tmpfiles.d systemd.conf etc/tmpfiles.d tmp.conf etc/tmpfiles.d tmp.mount etc/systemd/system diff --git a/systemd-config/files/kubernetes.conf.tmpfiles.d b/systemd-config/files/kubernetes.conf.tmpfiles.d new file mode 100644 index 0000000..f959a4c --- /dev/null +++ b/systemd-config/files/kubernetes.conf.tmpfiles.d @@ -0,0 +1 @@ +d /var/run/kubernetes 0755 root root - diff --git a/systemd-config/files/systemd.conf.tmpfiles.d b/systemd-config/files/systemd.conf.tmpfiles.d index 3a5f2fe..0f1c5ba 100644 --- a/systemd-config/files/systemd.conf.tmpfiles.d +++ b/systemd-config/files/systemd.conf.tmpfiles.d @@ -40,3 +40,5 @@ a+ /var/log/journal/%m/system.journal - - - - group:sys_protected:r--,group:whee d /var/lib/systemd 0755 root root - d /var/lib/systemd/coredump 0755 root root 3d + +e /var/lib/puppet/reports/* 0755 root root 30d diff --git a/systemd-config/source-debian/kubernetes.conf b/systemd-config/source-debian/kubernetes.conf new file mode 100644 index 0000000..f959a4c --- /dev/null +++ b/systemd-config/source-debian/kubernetes.conf @@ -0,0 +1 @@ +d /var/run/kubernetes 0755 root root - diff --git a/systemd-config/source-debian/systemd.conf b/systemd-config/source-debian/systemd.conf index 3a5f2fe..0f1c5ba 100644 --- a/systemd-config/source-debian/systemd.conf +++ b/systemd-config/source-debian/systemd.conf @@ -40,3 +40,5 @@ a+ /var/log/journal/%m/system.journal - - - - group:sys_protected:r--,group:whee d /var/lib/systemd 0755 root root - d /var/lib/systemd/coredump 0755 root root 3d + +e /var/lib/puppet/reports/* 0755 root root 30d