From 74c2eefb191c537b3222702f23e3b8e61e23e954 Mon Sep 17 00:00:00 2001 From: "a@a.ru" Date: Wed, 24 Apr 2019 12:42:04 +0300 Subject: [PATCH] Remove obsolete files and vars --- Makefile | 33 ----------------------------- appspec.yml.example | 19 ----------------- roles/main_infra/files/variables.tf | 1 - 3 files changed, 53 deletions(-) delete mode 100644 Makefile delete mode 100644 appspec.yml.example diff --git a/Makefile b/Makefile deleted file mode 100644 index 49f2010..0000000 --- a/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -.PHONY: help - -IMAGE_NAME ?= poa-aws -INFRA_PREFIX ?= poa-example -KEY_PAIR ?= poa - -help: - @echo "$(IMAGE_NAME)" - @perl -nle'print $& if m{^[a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' - -check: lint ## Run linters and validation - @bin/infra precheck - @terraform validate -var-file=ignore.tfvars base - @if [ -f main.tfvars ]; then \ - terraform validate \ - -var='db_password=foo' \ - -var='new_relic_app_name=foo' \ - -var='new_relic_license_key=foo' \ - -var-file=main.tfvars main; \ - fi - @rm ignore.tfvars - -format: ## Apply canonical formatting to Terraform files - @terraform fmt - -lint: shellcheck check-format ## Lint scripts and config files - -check-format: - @terraform fmt -check=true - -shellcheck: - @shellcheck --shell=bash bin/infra - @shellcheck --shell=bash modules/stack/libexec/init.sh diff --git a/appspec.yml.example b/appspec.yml.example deleted file mode 100644 index ee2a8f0..0000000 --- a/appspec.yml.example +++ /dev/null @@ -1,19 +0,0 @@ -version: 0.0 -os: linux -files: - - source: . - destination: /opt/app -hooks: - ApplicationStop: - - location: bin/stop.sh - timeout: 300 - AfterInstall: - - location: bin/build.sh - ApplicationStart: - - location: bin/migrate.sh - timeout: 300 - - location: bin/start.sh - timeout: 3600 - ValidateService: - - location: bin/health_check.sh - timeout: 3600 diff --git a/roles/main_infra/files/variables.tf b/roles/main_infra/files/variables.tf index 482bc19..d9b97a5 100644 --- a/roles/main_infra/files/variables.tf +++ b/roles/main_infra/files/variables.tf @@ -1,4 +1,3 @@ -variable "region" {} variable "prefix" {} variable "key_name" {} variable "vpc_cidr" {}