From 39bf99b420cd477cd2eb1b417fbd8a467429a088 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 26 Feb 2024 13:13:55 +0100 Subject: [PATCH] overlay coreos-base/misc-files: Reorganize the files a bit The files directory of the package was getting crowded and the names of the files weren't really saying much. --- .../files/{ => bash}/99-flatcar-bcc | 0 .../files/{ => ntp}/ntp-environment.conf | 0 .../misc-files/files/{ => ntp}/ntp.conf | 0 .../files/{ => ntp}/ntpd-always-restart.conf | 0 .../files/{ => openssh}/50-flatcar-ssh.conf | 0 .../files/{ => openssh}/50-flatcar-sshd.conf | 0 .../{ => openssh}/no-trigger-limit-burst.conf | 0 .../{ => selinux}/10-var-lib-selinux.conf | 0 .../files/{selinux-config => selinux/config} | 0 .../misc-files/misc-files-0-r4.ebuild | 28 +++++++++---------- 10 files changed, 14 insertions(+), 14 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/{ => bash}/99-flatcar-bcc (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/{ => ntp}/ntp-environment.conf (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/{ => ntp}/ntp.conf (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/{ => ntp}/ntpd-always-restart.conf (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/{ => openssh}/50-flatcar-ssh.conf (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/{ => openssh}/50-flatcar-sshd.conf (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/{ => openssh}/no-trigger-limit-burst.conf (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/{ => selinux}/10-var-lib-selinux.conf (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/{selinux-config => selinux/config} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/99-flatcar-bcc b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/bash/99-flatcar-bcc similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/99-flatcar-bcc rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/bash/99-flatcar-bcc diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp-environment.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp/ntp-environment.conf similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp-environment.conf rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp/ntp-environment.conf diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp/ntp.conf similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp.conf rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp/ntp.conf diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntpd-always-restart.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp/ntpd-always-restart.conf similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntpd-always-restart.conf rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/ntp/ntpd-always-restart.conf diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/50-flatcar-ssh.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/openssh/50-flatcar-ssh.conf similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/50-flatcar-ssh.conf rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/openssh/50-flatcar-ssh.conf diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/50-flatcar-sshd.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/openssh/50-flatcar-sshd.conf similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/50-flatcar-sshd.conf rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/openssh/50-flatcar-sshd.conf diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/no-trigger-limit-burst.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/openssh/no-trigger-limit-burst.conf similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/no-trigger-limit-burst.conf rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/openssh/no-trigger-limit-burst.conf diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/10-var-lib-selinux.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux/10-var-lib-selinux.conf similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/10-var-lib-selinux.conf rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux/10-var-lib-selinux.conf diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux-config b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux/config similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux-config rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux/config diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r4.ebuild index f282ddd6fc..fd9bf07386 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r4.ebuild @@ -122,10 +122,10 @@ src_install() { done insinto '/etc/selinux/' - newins "${FILESDIR}/selinux-config" config + doins "${FILESDIR}/selinux/config" insinto '/etc/bash/bashrc.d' - doins "${FILESDIR}/99-flatcar-bcc" + doins "${FILESDIR}/bash/99-flatcar-bcc" insinto '/usr/share/flatcar' # The "oems" folder should contain a file "$OEMID" for each expected OEM sysext and @@ -149,29 +149,29 @@ src_install() { fowners --no-dereference 500:500 "${link}" done + if use ntp; then + insinto /etc + doins "${FILESDIR}/ntp/ntp.conf" + misc_files_install_dropin ntpd.service "${FILESDIR}/ntp/ntpd-always-restart.conf" + misc_files_install_dropin ntpdate.service "${FILESDIR}/ntp/ntp-environment.conf" + misc_files_install_dropin sntp.service "${FILESDIR}/ntp/ntp-environment.conf" + fi + if use openssh; then # Install our configuration snippets. insinto /etc/ssh/ssh_config.d - doins "${FILESDIR}/50-flatcar-ssh.conf" + doins "${FILESDIR}/openssh/50-flatcar-ssh.conf" insinto /etc/ssh/sshd_config.d - doins "${FILESDIR}/50-flatcar-sshd.conf" + doins "${FILESDIR}/openssh/50-flatcar-sshd.conf" # Install our socket drop-in file that disables the rate # limiting on the sshd socket. - misc_files_install_dropin sshd.socket "${FILESDIR}/no-trigger-limit-burst.conf" + misc_files_install_dropin sshd.socket "${FILESDIR}/openssh/no-trigger-limit-burst.conf" # Enable some sockets that aren't enabled by their own ebuilds. systemd_enable_service sockets.target sshd.socket fi - if use ntp; then - insinto /etc - doins "${FILESDIR}/ntp.conf" - misc_files_install_dropin ntpd.service "${FILESDIR}/ntpd-always-restart.conf" - misc_files_install_dropin ntpdate.service "${FILESDIR}/ntp-environment.conf" - misc_files_install_dropin sntp.service "${FILESDIR}/ntp-environment.conf" - fi - if use policycoreutils; then # Exceptionally, the location for policy definitions is set up # in profiles/coreos/base/profile.bashrc. See the comment for @@ -179,7 +179,7 @@ src_install() { # # Recreate the symlink in /var in case of wiping the root # filesystem. - dotmpfiles "${FILESDIR}/10-var-lib-selinux.conf" + dotmpfiles "${FILESDIR}/selinux/10-var-lib-selinux.conf" fi # Create a symlink for Kubernetes to redirect writes from /usr/libexec/... to /var/kubernetes/...