Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

getenforce and setenforce checks added. also module dependency added for bootstrap automate #8739

Merged
merged 2 commits into from
Jan 16, 2025
Merged

getenforce and setenforce checks added. also module dependency added for bootstrap automate #8739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a686b7e
getenforce and setenforce checks added. also module dependency added …
vivekshankar1 Jan 16, 2025
b0dee0f
dummy change for backend deployment
vivekshankar1 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion components/automate-backend-deployment/habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ do_setup_environment() {
set_buildtime_env SSL_CERT_FILE "$(pkg_path_for cacerts)/ssl/cert.pem"
}


do_build() {
# bundle install the required gems for smoke and integration tests
cd $PLAN_CONTEXT/../../../test
Expand Down
2 changes: 1 addition & 1 deletion ...s/automate-cli/pkg/verifyserver/services/softwareversionservice/softwareversionservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var cmdCheckArray = []string{"mkdir", "useradd", "usermod", "groupadd", "chown",
"grep", "which", "cp", "curl", "bash", "sh",
"sysctl", "cat", "sed", "mount", "mv", "systemctl",
"wget", "rsync", "tar", "find", "sort", "awk",
"xargs", "tail", "id"}
"xargs", "tail", "id", "getenforce", "setenforce"}

func (sv *SoftwareVersionService) GetSoftwareVersionDetails(query string) (*models.SoftwareVersionDetails, error) {
sv.logger.Debug("The query parameter entered: ", query)
Expand Down
10 changes: 10 additions & 0 deletions terraform/a2ha-terraform/modules/automate/templates/provision.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ check_selinux() {
if [ -e /etc/selinux/config ]; then
echo "SELinux configuration file found."

# check if getenforce command exists otherwise throw error
if ! command -v getenforce &> /dev/null; then
echo "SELinux commands not found. Please install the getenforce command."
exit 1
fi
# Check for SELinux status and mode
selinux_status=$(getenforce)
selinux_mode=$(awk -F= '/^SELINUX=/ {print $2}' /etc/selinux/config)
Expand All @@ -17,6 +22,11 @@ check_selinux() {

# If SELinux is enabled (Enforcing), set it to Permissive
if [ "$selinux_status" == "Enforcing" ]; then
# check if setenforce command exists otherwise throw error
if ! command -v setenforce &> /dev/null; then
echo "SELinux commands not found. Please install the setenforce command."
exit 1
fi
echo "SELinux is currently in Enforcing mode. Changing to Permissive..."
setenforce Permissive
echo "SELinux mode set to Permissive."
Expand Down
48 changes: 0 additions & 48 deletions terraform/a2ha-terraform/modules/opensearch/templates/provision.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,6 @@

set -Eeuo pipefail

# Function to check SELinux status and mode
check_selinux() {
# Check if /etc/selinux exists (common to RHEL, CentOS, Fedora)
if [ -e /etc/selinux/config ]; then
echo "SELinux configuration file found."

# Check for SELinux status and mode
selinux_status=$(getenforce)
selinux_mode=$(awk -F= '/^SELINUX=/ {print $2}' /etc/selinux/config)

echo "SELinux Status: $selinux_status"
echo "SELinux Mode: $selinux_mode"

# If SELinux is enabled (Enforcing), set it to Permissive
if [ "$selinux_status" == "Enforcing" ]; then
echo "SELinux is currently in Enforcing mode. Changing to Permissive..."
setenforce Permissive
echo "SELinux mode set to Permissive."
fi

# Check if /etc/selinux does not exist (common to Debian, Ubuntu)
elif [ -e /etc/default/grub ]; then
echo "SELinux configuration file not found."

# Check if "selinux=1" is present in grub (Enforcing)
if grep -q "selinux=1" /etc/default/grub; then
echo "SELinux is enabled (Enforcing) in GRUB."

# Change GRUB to Permissive
sed -i 's/selinux=1/selinux=0/' /etc/default/grub
# update-grub
# echo "GRUB configuration updated to Permissive."
# fi

# SELinux not found in grub (Disabled or Permissive)
else
echo "SELinux is not found or is already disabled in GRUB."
fi

# SELinux configuration file not found (SUSE, Amazon Linux, etc.)
else
echo "SELinux configuration file not found."
fi
}

# Check SELinux
check_selinux

umask 0022

export HAB_NONINTERACTIVE=true
Expand Down
58 changes: 5 additions & 53 deletions terraform/a2ha-terraform/modules/postgresql/templates/provision.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,63 +2,15 @@

set -Eeuo pipefail

# Function to check SELinux status and mode
check_selinux() {
# Check if /etc/selinux exists (common to RHEL, CentOS, Fedora)
if [ -e /etc/selinux/config ]; then
echo "SELinux configuration file found."

# Check for SELinux status and mode
selinux_status=$(getenforce)
selinux_mode=$(awk -F= '/^SELINUX=/ {print $2}' /etc/selinux/config)

echo "SELinux Status: $selinux_status"
echo "SELinux Mode: $selinux_mode"

# If SELinux is enabled (Enforcing), set it to Permissive
if [ "$selinux_status" == "Enforcing" ]; then
echo "SELinux is currently in Enforcing mode. Changing to Permissive..."
setenforce Permissive
echo "SELinux mode set to Permissive."
fi

# Check if /etc/selinux does not exist (common to Debian, Ubuntu)
elif [ -e /etc/default/grub ]; then
echo "SELinux configuration file not found."

# Check if "selinux=1" is present in grub (Enforcing)
if grep -q "selinux=1" /etc/default/grub; then
echo "SELinux is enabled (Enforcing) in GRUB."

# Change GRUB to Permissive
sed -i 's/selinux=1/selinux=0/' /etc/default/grub
# update-grub
# echo "GRUB configuration updated to Permissive."
# fi

# SELinux not found in grub (Disabled or Permissive)
else
echo "SELinux is not found or is already disabled in GRUB."
fi

# SELinux configuration file not found (SUSE, Amazon Linux, etc.)
else
echo "SELinux configuration file not found."
fi
}

# Check SELinux
check_selinux

umask 0022

export HAB_NONINTERACTIVE=true
export HAB_NOCOLORING=true
export HAB_LICENSE=accept-no-persist

PG_ORIGIN_NAME=$(echo "${postgresql_pkg_ident}" | awk -F/ '{print $1}')
PG_ORIGIN_NAME=$(echo "vivek-shankar/automate-ha-postgresql" | awk -F/ '{print $1}')
export PG_ORIGIN_NAME
PG_PKG_NAME=$(echo "${postgresql_pkg_ident}" | awk -F/ '{print $2}')
PG_PKG_NAME=$(echo "vivek-shankar/automate-ha-postgresql" | awk -F/ '{print $2}')
export PG_PKG_NAME

PGLEADERCHK_ORIGIN_NAME=$(echo "${pgleaderchk_pkg_ident}" | awk -F/ '{print $1}')
Expand Down Expand Up @@ -103,14 +55,14 @@ wait_for_aib_extraction
export LOGCMD='>>${tmp_path}/svc-load.log 2>&1'

if [ -e /hab/sup/default/specs/"$PG_PKG_NAME".spec ]; then
if ! grep -q "ident *= *\"${postgresql_pkg_ident}\"" /hab/sup/default/specs/"$PG_PKG_NAME".spec; then
if ! grep -q "ident *= *\"vivek-shankar/automate-ha-postgresql\"" /hab/sup/default/specs/"$PG_PKG_NAME".spec; then
# unload the old pkg_ident and then load in the new
hab svc unload "$PG_ORIGIN_NAME/$PG_PKG_NAME"
sleep 10
bash -c 'eval hab svc load ${postgresql_pkg_ident} ${postgresql_svc_load_args} "$LOGCMD"'
bash -c 'eval hab svc load vivek-shankar/automate-ha-postgresql ${postgresql_svc_load_args} "$LOGCMD"'
fi
else
bash -c 'eval hab svc load ${postgresql_pkg_ident} ${postgresql_svc_load_args} "$LOGCMD"'
bash -c 'eval hab svc load vivek-shankar/automate-ha-postgresql ${postgresql_svc_load_args} "$LOGCMD"'
fi

if [ -e /hab/sup/default/specs/"$PGLEADERCHK_PKG_NAME".spec ]; then
Expand Down
2 changes: 1 addition & 1 deletion terraform/a2ha-terraform/reference_architectures/existing_nodes/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ module "bootstrap_automate" {
nfs_mount_path = var.nfs_mount_path
automate_base_path = var.automate_base_path
opensearch_base_path = var.opensearch_base_path
depends_on = [module.airgap_bundle-frontend, module.habitat-frontend]
depends_on = [module.airgap_bundle-frontend, module.habitat-frontend, module.postgresql, module.opensearch]
}

module "automate" {
Expand Down
Loading