web/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: renaming scheme for config files

Browse Source
This commit is contained in:
Maxim Hutz
2025-02-13 15:35:00 -05:00
parent 6193d99e1f
commit 143e6be9a0
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Taskfile.yml
View File

@@ -13,7 +13,7 @@ tasks:
enter: enter:
cmd: aws ssm start-session --target $INSTANCE_ID cmd: aws ssm start-session --target $INSTANCE_ID
env: env:
INSTANCE_ID: { sh: jq -r .instance_id.value < config/infrastructure.secret.tf.json } INSTANCE_ID: { sh: jq -r .instance_id.value < config/infrastructure.secret.json }
AWS_REGION: { sh: jq -r .aws_region < config/ansible.secret.json } AWS_REGION: { sh: jq -r .aws_region < config/ansible.secret.json }
AWS_ACCESS_KEY_ID: { sh: jq -r .aws_access_key < config/ansible.secret.json } AWS_ACCESS_KEY_ID: { sh: jq -r .aws_access_key < config/ansible.secret.json }
AWS_SECRET_ACCESS_KEY: { sh: jq -r .aws_secret_key < config/ansible.secret.json } AWS_SECRET_ACCESS_KEY: { sh: jq -r .aws_secret_key < config/ansible.secret.json }

4
playbooks/fast.yml
View File

@@ -2,7 +2,7 @@
hosts: localhost hosts: localhost
vars_files: vars_files:
- ../config/ansible.secret.json - ../config/ansible.secret.json
- ../config/infrastructure.secret.tf.json - ../config/infrastructure.secret.json
gather_facts: false gather_facts: false
tasks: tasks:
- name: Log into Docker. - name: Log into Docker.
@@ -34,7 +34,7 @@
gather_facts: false gather_facts: false
vars_files: vars_files:
- ../config/ansible.secret.json - ../config/ansible.secret.json
- ../config/infrastructure.secret.tf.json - ../config/infrastructure.secret.json
vars: vars:
ansible_connection: aws_ssm ansible_connection: aws_ssm
ansible_aws_ssm_plugin: "{{ ssm_plugin }}" ansible_aws_ssm_plugin: "{{ ssm_plugin }}"

2
playbooks/restore.yml
View File

@@ -4,7 +4,7 @@
gather_facts: false gather_facts: false
vars_files: vars_files:
- ../config/ansible.secret.json - ../config/ansible.secret.json
- ../config/infrastructure.secret.tf.json - ../config/infrastructure.secret.json
vars: vars:
ansible_connection: aws_ssm ansible_connection: aws_ssm
ansible_python_interpreter: /usr/bin/python3 ansible_python_interpreter: /usr/bin/python3

2
playbooks/slow.yml
View File

@@ -47,7 +47,7 @@
gather_facts: false gather_facts: false
vars_files: vars_files:
- ../config/ansible.secret.json - ../config/ansible.secret.json
- ../config/infrastructure.secret.tf.json - ../config/infrastructure.secret.json
vars: vars:
ansible_connection: aws_ssm ansible_connection: aws_ssm
ansible_python_interpreter: /usr/bin/python3 ansible_python_interpreter: /usr/bin/python3

6
terraform/Taskfile.yml
View File

@@ -2,9 +2,9 @@ version: 3
silent: true silent: true
vars: vars:
BACKEND: ../config/backend.secret.tf.json BACKEND: ../config/backend.secret.json
VARIABLES: ../config/variables.secret.tf.json VARIABLES: ../config/variables.secret.json
OUTPUT: ../config/infrastructure.secret.tf.json OUTPUT: ../config/infrastructure.secret.json
tasks: tasks:
init: terraform init -backend-config={{.BACKEND}} init: terraform init -backend-config={{.BACKEND}}

6
terraform/main.tf
View File

@@ -4,8 +4,10 @@ resource "aws_eip" "public" {
domain = "vpc" domain = "vpc"
} }
data "aws_iam_instance_profile" "ssm" { # An instance profile for access via AWS SSM.
resource "aws_iam_instance_profile" "ssm" {
name = "SSMInstanceProfile" name = "SSMInstanceProfile"
role = "AmazonSSMRoleForInstancesQuickSetup"
} }
# The Gitea instance. # The Gitea instance.
@@ -18,7 +20,7 @@ resource "aws_instance" "this" {
user_data = file("install.sh") user_data = file("install.sh")
user_data_replace_on_change = false user_data_replace_on_change = false
iam_instance_profile = data.aws_iam_instance_profile.ssm.name iam_instance_profile = aws_iam_instance_profile.ssm.name
vpc_security_group_ids = [aws_security_group.public_access.id] vpc_security_group_ids = [aws_security_group.public_access.id]
metadata_options { metadata_options {