diff --git a/src/ApiStage.ts b/src/ApiStage.ts index 180cacbf..44d82b7a 100644 --- a/src/ApiStage.ts +++ b/src/ApiStage.ts @@ -39,7 +39,8 @@ export class ApiStage extends Stage { usEastCertificateStack.addDependency(dnsStack); // Only deploy DNSSEC on accp and prod - if (props.branch != 'development') { + // TODO enable DNSSEC on accp (deployment on accp did not work yet) + if (props.branch == 'production') { const dnssecStack = new DNSSECStack(this, 'dnssec-stack', { env: { region: 'us-east-1' } }); dnssecStack.addDependency(dnsStack); } diff --git a/src/DNSSECStack.ts b/src/DNSSECStack.ts index a25dc639..c40e7ef1 100644 --- a/src/DNSSECStack.ts +++ b/src/DNSSECStack.ts @@ -33,7 +33,7 @@ export class DNSSECStack extends Stack { // KSK const accountDnssecKmsKeyArn = SSM.StringParameter.valueForStringParameter(this, Statics.ssmAccountDnsSecKmsKey); - const dnssecKeySigning = new Route53.CfnKeySigningKey(this, 'dnssec-keysigning-key-2', { + const dnssecKeySigning = new Route53.CfnKeySigningKey(this, 'dnssec-keysigning-key', { name: 'irma_issue_ksk', status: 'ACTIVE', hostedZoneId: zoneId, diff --git a/src/DNSStack.ts b/src/DNSStack.ts index 9d1cfde7..3f24374e 100644 --- a/src/DNSStack.ts +++ b/src/DNSStack.ts @@ -73,7 +73,7 @@ export class DNSStack extends Stack { let dsValue = ''; switch (this.branch) { case 'acceptance': - dsValue = '52561 13 2 EBD9ED03EC245E70D458F7B300606FB1DBB3C6D185E19EDB835FBC47B396530A'; + dsValue = '52561 13 2 EBD9ED03EC245E70D458F7B300606FB1DBB3C6D185E19EDB835FBC47B396530A'; // TODO manually removed so add again when deploying DNSSEC stack to accp again break; case 'production': dsValue = '60066 13 2 932CD585B029E674E17C4C33DFE7DE2C84353ACD8C109760FD17A6CDBD0CF3FA'; // TODO fix in prod diff --git a/src/app/templates/footer.mustache b/src/app/templates/footer.mustache index 347b3be5..9ac14f29 100644 --- a/src/app/templates/footer.mustache +++ b/src/app/templates/footer.mustache @@ -3,17 +3,9 @@
- {{#shownav}} -

Mijn Nijmegen

-
- -
- {{/shownav}}
+
diff --git a/src/app/templates/header.mustache b/src/app/templates/header.mustache index 1d0cd86c..d3f84154 100644 --- a/src/app/templates/header.mustache +++ b/src/app/templates/header.mustache @@ -73,13 +73,7 @@