From 21f359456c01084c07ab52764fd3aef3082bfdec Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 22 Oct 2024 11:35:08 -0400 Subject: [PATCH 1/5] install createrepo for airgap --- setup/so-functions | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 5ebf76c17..ad10752ea 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1825,10 +1825,9 @@ repo_sync_local() { if [[ ! $is_airgap ]]; then curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install retry 5 60 "dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" >> "$setup_log" 2>&1 || fail_setup - # After the download is complete run createrepo - create_repo fi - + # After the download is complete run createrepo + create_repo else # Add the proper repos for unsupported stuff echo "Adding Repos" From 8d2ae23ae65751cec3d855c4463b8b93767fc27a Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 22 Oct 2024 13:56:38 -0400 Subject: [PATCH 2/5] install createrepo on airgap and non airgap --- salt/manager/init.sls | 6 ++++++ setup/so-functions | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/salt/manager/init.sls b/salt/manager/init.sls index 2feda45ae..31af523cc 100644 --- a/salt/manager/init.sls +++ b/salt/manager/init.sls @@ -45,6 +45,12 @@ yara_log_dir: - user - group +{% if GLOBALS.os_family == 'RedHat' %} +install_createrepo: + pkg.installed: + - name: createrepo +{% endif %} + repo_conf_dir: file.directory: - name: /opt/so/conf/reposync diff --git a/setup/so-functions b/setup/so-functions index ad10752ea..f4262152f 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -803,7 +803,6 @@ create_manager_pillars() { create_repo() { title "Create the repo directory" - logCmd "dnf -y install yum-utils createrepo" logCmd "createrepo /nsm/repo" } @@ -1821,13 +1820,14 @@ repo_sync_local() { echo "gpgcheck=1" >> /opt/so/conf/reposync/repodownload.conf logCmd "dnf repolist" + logCmd "dnf -y install yum-utils createrepo" if [[ ! $is_airgap ]]; then curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install retry 5 60 "dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" >> "$setup_log" 2>&1 || fail_setup + # After the download is complete run createrepo + create_repo fi - # After the download is complete run createrepo - create_repo else # Add the proper repos for unsupported stuff echo "Adding Repos" From 7a0f6d5e9326c733248ad079eb274dc1086b5477 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 22 Oct 2024 16:42:01 -0400 Subject: [PATCH 3/5] fix pkg name --- salt/manager/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/manager/init.sls b/salt/manager/init.sls index 31af523cc..96055df24 100644 --- a/salt/manager/init.sls +++ b/salt/manager/init.sls @@ -48,7 +48,7 @@ yara_log_dir: {% if GLOBALS.os_family == 'RedHat' %} install_createrepo: pkg.installed: - - name: createrepo + - name: createrepo_c {% endif %} repo_conf_dir: From 1df104967ebb426a52d5dbb0f109005c115b1a36 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 22 Oct 2024 16:50:23 -0400 Subject: [PATCH 4/5] fix pkg name --- salt/manager/tools/sbin/soup | 2 +- setup/so-functions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index c592dffe4..1845918c1 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -914,7 +914,7 @@ update_airgap_repo() { echo "Syncing new updates to /nsm/repo" rsync -av $AGREPO/* /nsm/repo/ echo "Creating repo" - dnf -y install yum-utils createrepo + dnf -y install yum-utils createrepo_c createrepo /nsm/repo } diff --git a/setup/so-functions b/setup/so-functions index f4262152f..8e1297812 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1820,7 +1820,7 @@ repo_sync_local() { echo "gpgcheck=1" >> /opt/so/conf/reposync/repodownload.conf logCmd "dnf repolist" - logCmd "dnf -y install yum-utils createrepo" + logCmd "dnf -y install yum-utils createrepo_c" if [[ ! $is_airgap ]]; then curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install From 17ba048b50da30a9933573ddae9c875c9880f461 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 23 Oct 2024 10:40:26 -0400 Subject: [PATCH 5/5] use manager state to install createrepo_c for airgap --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 8e1297812..51ddabadf 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -803,6 +803,7 @@ create_manager_pillars() { create_repo() { title "Create the repo directory" + logCmd "dnf -y install yum-utils createrepo_c" logCmd "createrepo /nsm/repo" } @@ -1820,7 +1821,6 @@ repo_sync_local() { echo "gpgcheck=1" >> /opt/so/conf/reposync/repodownload.conf logCmd "dnf repolist" - logCmd "dnf -y install yum-utils createrepo_c" if [[ ! $is_airgap ]]; then curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install