Skip to content

Commit 7888721

Browse files
brisktbriskt
authored
Merge pull request #316 from sil-org/rename
Release 14.1.1 -- rename silinternational to sil-org
2 parents 9ebae7d + 5ae1add commit 7888721

File tree

13 files changed

+37
-25
lines changed

13 files changed

+37
-25
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 SIL International
3+
Copyright (c) 2017 SIL Global
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎modules/010-cluster/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ ssl certificate, core application load balancer, and a CloudWatch log group
5454

5555
```hcl
5656
module "cluster" {
57-
source = "github.com/silinternational/idp-in-a-box//terraform/010-cluster"
57+
source = "sil-org/idp/aws//modules/010-cluster"
58+
version = "~> 14.0" # This version number is an example only. Use the latest available."
59+
5860
app_name = var.app_name
5961
app_env = var.app_env
6062
aws_instance = var.aws_instance

‎modules/010-cluster/main.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Create VPC
33
*/
44
module "vpc" {
5-
source = "silinternational/vpc/aws"
5+
source = "sil-org/vpc/aws"
66
version = "~> 1.0"
77

88
app_name = var.app_name
@@ -23,7 +23,7 @@ module "vpc" {
2323
* Security group to limit traffic to Cloudflare IPs
2424
*/
2525
module "cloudflare-sg" {
26-
source = "github.com/silinternational/terraform-modules//aws/cloudflare-sg?ref=8.13.2"
26+
source = "github.com/sil-org/terraform-modules//aws/cloudflare-sg?ref=8.13.2"
2727
vpc_id = module.vpc.id
2828
}
2929

@@ -44,7 +44,7 @@ data "aws_ami" "ecs_ami" {
4444
* Create auto-scaling group
4545
*/
4646
module "asg" {
47-
source = "github.com/silinternational/terraform-modules//aws/asg?ref=8.14.1"
47+
source = "github.com/sil-org/terraform-modules//aws/asg?ref=8.14.1"
4848
app_name = var.app_name
4949
app_env = var.app_env
5050
aws_instance = var.aws_instance
@@ -69,7 +69,7 @@ data "aws_acm_certificate" "wildcard" {
6969
* Create application load balancer for public access
7070
*/
7171
module "alb" {
72-
source = "silinternational/alb/aws"
72+
source = "sil-org/alb/aws"
7373
version = "~> 1.1"
7474

7575
app_name = var.app_name
@@ -87,7 +87,7 @@ module "alb" {
8787
* Create application load balancer for internal use
8888
*/
8989
module "internal_alb" {
90-
source = "silinternational/alb/aws"
90+
source = "sil-org/alb/aws"
9191
version = "~> 1.0"
9292

9393
alb_name = "alb-${var.app_name}-${var.app_env}-int"
@@ -120,7 +120,7 @@ resource "aws_cloudwatch_log_group" "logs" {
120120
module "ecs-service-cloudwatch-dashboard" {
121121
count = var.create_dashboard ? 1 : 0
122122

123-
source = "silinternational/ecs-service-cloudwatch-dashboard/aws"
123+
source = "sil-org/ecs-service-cloudwatch-dashboard/aws"
124124
version = "~> 3.1"
125125

126126
cluster_name = var.ecs_cluster_name

‎modules/032-db-backup/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ This module is used to run mysqldump and backup files to S3 and optionally synch
3939

4040
```hcl
4141
module "dbbackup" {
42-
source = "github.com/silinternational/idp-in-a-box//terraform/032-db-backup"
42+
source = "sil-org/idp/aws//modules/032-db-backup"
43+
version = "~> 14.0" # This version number is an example only. Use the latest available."
44+
4345
app_env = var.app_env
4446
app_name = var.app_name
4547
cloudwatch_log_group_name = var.cloudwatch_log_group_name

‎modules/032-db-backup/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ locals {
115115
}
116116

117117
module "backup_task" {
118-
source = "silinternational/scheduled-ecs-task/aws"
118+
source = "sil-org/scheduled-ecs-task/aws"
119119
version = "~> 0.1.1"
120120

121121
name = "${var.idp_name}-${var.app_name}-${var.app_env}"
@@ -144,7 +144,7 @@ resource "aws_ecs_task_definition" "cron_td" {
144144
module "aws_backup" {
145145
count = var.enable_aws_backup ? 1 : 0
146146

147-
source = "silinternational/backup/aws"
147+
source = "sil-org/backup/aws"
148148
version = "~> 0.3.1"
149149

150150
app_name = var.idp_name
@@ -168,7 +168,7 @@ data "aws_db_instance" "this" {
168168
module "s3_to_b2_sync" {
169169
count = var.enable_s3_to_b2_sync ? 1 : 0
170170

171-
source = "silinternational/sync-s3-to-b2/aws"
171+
source = "sil-org/sync-s3-to-b2/aws"
172172
version = "~> 0.2.0"
173173

174174
app_name = "${var.idp_name}-${var.app_name}"

‎modules/040-id-broker/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ Note 2: `internal_alb_listener_arn` can be omitted if `alb_listener_arn` is prov
143143

144144
```hcl
145145
module "broker" {
146-
source = "github.com/silinternational/idp-in-a-box//terraform/040-id-broker"
146+
source = "sil-org/idp/aws//modules/040-id-broker"
147+
version = "~> 14.0" # This version number is an example only. Use the latest available."
148+
147149
app_env = var.app_env
148150
app_name = var.app_name
149151
cloudflare_domain = var.cloudflare_domain

‎modules/040-id-broker/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ locals {
219219
}
220220

221221
module "ecsservice" {
222-
source = "github.com/silinternational/terraform-modules//aws/ecs/service-only?ref=8.13.2"
222+
source = "github.com/sil-org/terraform-modules//aws/ecs/service-only?ref=8.13.2"
223223
cluster_id = var.ecs_cluster_id
224224
service_name = "${var.idp_name}-${var.app_name}"
225225
service_env = var.app_env
@@ -233,7 +233,7 @@ module "ecsservice" {
233233
}
234234

235235
module "cron_task" {
236-
source = "silinternational/scheduled-ecs-task/aws"
236+
source = "sil-org/scheduled-ecs-task/aws"
237237
version = "~> 0.1"
238238

239239
name = "${var.idp_name}-${var.app_name}-cron-${var.app_env}-${local.aws_region}"
@@ -280,7 +280,7 @@ locals {
280280
}
281281

282282
module "email_service" {
283-
source = "silinternational/ecs-service/aws"
283+
source = "sil-org/ecs-service/aws"
284284
version = "~> 0.3.0"
285285

286286
cluster_id = var.ecs_cluster_id

‎modules/050-pw-manager/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This module is used to create an ECS service running the password manager API.
44

5-
The password manager UI can be deployed using the [silinternatonal/pages/cloudflare](https://registry.terraform.io/modules/silinternational/pages/cloudflare/latest) module.
5+
The password manager UI can be deployed using the [sil-org/pages/cloudflare](https://registry.terraform.io/modules/sil-org/pages/cloudflare/latest) module.
66

77
## What this does
88

@@ -72,6 +72,9 @@ The password manager UI can be deployed using the [silinternatonal/pages/cloudfl
7272

7373
```hcl
7474
module "pwmanager" {
75+
source = "sil-org/idp/aws//modules/050-pw-manager"
76+
version = "~> 14.0" # This version number is an example only. Use the latest available."
77+
7578
alb_dns_name = data.terraform_remote_state.cluster.alb_dns_name
7679
alb_https_listener_arn = data.terraform_remote_state.cluster.alb_https_listener_arn
7780
alerts_email = var.alerts_email
@@ -112,7 +115,6 @@ module "pwmanager" {
112115
password_rule_minscore = var.password_rule_minscore
113116
recaptcha_key = var.recaptcha_key
114117
recaptcha_secret = var.recaptcha_secret
115-
source = "github.com/silinternational/idp-in-a-box//terraform/050-pw-manager"
116118
support_email = data.terraform_remote_state.broker.support_email
117119
support_name = data.terraform_remote_state.broker.support_name
118120
support_phone = var.support_phone

‎modules/050-pw-manager/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ locals {
121121
}
122122

123123
module "ecsservice" {
124-
source = "github.com/silinternational/terraform-modules//aws/ecs/service-only?ref=8.13.2"
124+
source = "github.com/sil-org/terraform-modules//aws/ecs/service-only?ref=8.13.2"
125125
cluster_id = var.ecs_cluster_id
126126
service_name = "${var.idp_name}-${var.app_name}"
127127
service_env = var.app_env

‎modules/060-simplesamlphp/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ This module is used to create an ECS service running [SimpleSAMLphp](https://sim
6262

6363
```hcl
6464
module "cf_ips" {
65-
source = "github.com/silinternational/terraform-modules//cloudflare/ips?ref=8.7.0"
65+
source = "github.com/sil-org/terraform-modules//cloudflare/ips?ref=8.7.0"
6666
}
6767
6868
module "ssp" {
69-
source = "github.com/silinternational/idp-in-a-box//terraform/060-simplesamlphp"
69+
source = "sil-org/idp/aws//modules/060-simplesamlphp"
70+
version = "~> 14.0" # This version number is an example only. Use the latest available."
71+
7072
memory = var.memory
7173
cpu = var.cpu
7274
desired_count = var.desired_count

0 commit comments

Comments
 (0)