Skip to content

Commit 60b4bb7

Browse files
committed
removed redundant bastion_image parameter, the internal hostname_label for the bastion, updated terraformoptions doc and added link for the hardening script
1 parent a3ff644 commit 60b4bb7

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

docs/terraformoptions.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Configuration Terraform Options:
152152
|VM.Standard.E2.1
153153

154154
|bastion_upgrade
155-
|Whether to upgrade the bastion host after provisioning. It's useful to set this to false during development so the bastion is provisioned faster.
155+
|Whether to upgrade the bastion host packages after provisioning. It's useful to set this to false during development so the bastion is provisioned faster.
156156
|true/false
157157
|true
158158

modules/bastion/compute.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "oci_core_instance" "bastion" {
99
assign_public_ip = true
1010
subnet_id = oci_core_subnet.bastion[0].id
1111
display_name = "${var.oci_bastion_general.label_prefix}-bastion-vnic"
12-
hostname_label = "bastion-primary"
12+
hostname_label = "bastion"
1313
}
1414

1515
display_name = "${var.oci_bastion_general.label_prefix}-bastion"

modules/bastion/scripts/oracle.template.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# Copyright 2017, 2019, Oracle Corporation and/or affiliates. All rights reserved.
44
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl
55

6+
# Hardening of the host based on https://www.cisecurity.org/benchmark/oracle_linux/
7+
# This script is used only if the Oracle Linux platform image is used to create the bastion
8+
69
yum update --security
710

811
sed -i -e "s/autoinstall\s=\sno/# autoinstall = yes/g" /etc/uptrack/uptrack.conf

variables.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ variable "oci_base_bastion" {
5555
availability_domains = number
5656
bastion_access = string
5757
bastion_image_id = string
58-
bastion_image = string
5958
bastion_upgrade = bool
6059
bastion_shape = string
6160
create_bastion = bool
@@ -76,7 +75,6 @@ variable "oci_base_bastion" {
7675
availability_domains = 1
7776
bastion_access = "ANYWHERE"
7877
bastion_image_id = "NONE"
79-
bastion_image = "Oracle"
8078
bastion_shape = "VM.Standard.E2.1"
8179
bastion_upgrade = true
8280
create_bastion = false

0 commit comments

Comments
 (0)