Skip to content

Commit

Permalink
Add newlines at end of file
Browse files Browse the repository at this point in the history
  • Loading branch information
hellais committed Feb 13, 2024
1 parent ca6ec3e commit e97ca90
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 11 deletions.
3 changes: 2 additions & 1 deletion tf/environments/production/ansible/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
- name: restart clickhouse-server
service:
name: clickhouse-server
state: restarted
state: restarted

Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,5 @@
group: clickhouse
mode: '0640'
notify:
- restart clickhouse-server
- restart clickhouse-server

Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
</reader>

</users>
</clickhouse>
</clickhouse>

3 changes: 2 additions & 1 deletion tf/environments/production/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ output "asg_name" {

output "elb_hostname" {
value = aws_alb.main.dns_name
}
}

7 changes: 4 additions & 3 deletions tf/environments/production/scripts/update_known_hosts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ set -euxo pipefail

# To run you can ovverride the INVENTORY_FILE and KNOWN_HOSTS_FILE variables
# with a specific path
# You can also force the update by settting it to true:
# You can also force the update by settting it to true:
# export FORCE_UPDATE=true ./update_known_hosts.sh
INVENTORY_FILE="${INVENTORY_FILE:-ansible/inventory.ini}"
KNOWN_HOSTS_FILE="${KNOWN_HOSTS_FILE:-ansible/known_hosts}"
KNOWN_HOSTS_FILE="${KNOWN_HOSTS_FILE:-ansible/known_hosts}"
FORCE_UPDATE="${FORCE_UPDATE:-false}"

# fetch SSH host keys and update known_hosts
Expand All @@ -33,4 +33,5 @@ while read -r line; do
update_known_hosts $line
fi
# only look at the [all] group
done < <(awk '/^\[/{p=0}/\[all\]/{p=1}p' $INVENTORY_FILE | grep -v '\[' | awk '{print $1}')
done < <(awk '/^\[/{p=0}/\[all\]/{p=1}p' $INVENTORY_FILE | grep -v '\[' | awk '{print $1}')

3 changes: 2 additions & 1 deletion tf/environments/production/templates/ansible-inventory.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ ${hostname}
[clickhouse_servers]
%{ for hostname in clickhouse_servers ~}
${hostname}
%{ endfor ~}
%{ endfor ~}

3 changes: 2 additions & 1 deletion tf/environments/production/templates/clickhouse-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ sudo mkfs.ext4 -q -F ${device_name}
sudo mkdir -p /var/lib/clickhouse
sudo mount ${device_name} /var/lib/clickhouse
echo "${device_name} /var/lib/clickhouse ext4 defaults,nofail 0 2" | sudo tee -a /etc/fstab
sudo chown -R clickhouse:clickhouse /var/lib/clickhouse
sudo chown -R clickhouse:clickhouse /var/lib/clickhouse

3 changes: 2 additions & 1 deletion tf/environments/production/templates/ecs-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ ECS_ENABLE_TASK_IAM_ROLE=true
EOF

# Install datadog agent
DD_API_KEY=${datadog_api_key} DD_SITE="datadoghq.eu" bash -c "$(curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script_agent7.sh)"
DD_API_KEY=${datadog_api_key} DD_SITE="datadoghq.eu" bash -c "$(curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script_agent7.sh)"

3 changes: 2 additions & 1 deletion tf/environments/production/templates/task_definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
}
}
}
]
]

0 comments on commit e97ca90

Please sign in to comment.