Add: updated DorpsGek to version 2.0

OpenTTD · Dec 1, 2020 · 79c6573 · 79c6573
1 parent 6a41395
commit 79c6573
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 17 deletions.
diff --git a/app.py b/app.py
@@ -269,15 +269,16 @@
         env=env,
     )
 
-    if deployment == Deployment.PRODUCTION:
-        dorpsgek_policy = PolicyStack(app, f"{prefix}Dorpsgek-Policy", env=env).policy
-        DorpsgekStack(app, f"{prefix}Dorpsgek",
-            deployment=deployment,
-            policy=dorpsgek_policy,
-            cluster=ecs.cluster,
-            env=env,
-        )
+    dorpsgek_policy = PolicyStack(app, f"{prefix}Dorpsgek-Policy", env=env).policy
+    DorpsgekStack(app, f"{prefix}Dorpsgek",
+        deployment=deployment,
+        policy=dorpsgek_policy,
+        cluster=ecs.cluster,
+        vpc=vpc.vpc,
+        env=env,
+    )
 
+    if deployment == Deployment.PRODUCTION:
         # openttd-cdn.org is served via CloudFlare. To allow strict HTTPS
         # connections between CloudFlare and CloudFront, we provision the
         # CloudFront to also accept openttd-cdn.org as domain via HTTPS.

diff --git a/openttd/stack/application/dorpsgek.py b/openttd/stack/application/dorpsgek.py
@@ -4,9 +4,13 @@
     Tags,
 )
 from aws_cdk.aws_ecs import (
+    EfsVolumeConfiguration,
     ICluster,
     Secret,
+    Volume,
 )
+from aws_cdk.aws_ec2 import IVpc
+from aws_cdk.aws_efs import FileSystem
 
 from openttd.construct.ecs_https_container import ECSHTTPSContainer
 from openttd.construct.policy import Policy
@@ -18,26 +22,73 @@ class DorpsgekStack(Stack):
     application_name = "Dorpsgek"
     subdomain_name = "dorpsgek"
 
-    def __init__(self, scope: Construct, id: str, *, deployment: Deployment, policy: Policy, cluster: ICluster, **kwargs) -> None:
+    def __init__(
+        self,
+        scope: Construct,
+        id: str,
+        *,
+        deployment: Deployment,
+        policy: Policy,
+        cluster: ICluster,
+        vpc: IVpc,
+        **kwargs,
+    ) -> None:
         super().__init__(scope, id, **kwargs)
 
         Tags.of(self).add("Application", self.application_name)
         Tags.of(self).add("Deployment", deployment.value)
 
         policy.add_stack(self)
 
+        efs_seen = FileSystem(
+            self,
+            "DorpsGekSeenEFS",
+            vpc=vpc,
+        )
+        efs_seen.connections.allow_default_port_from(cluster)
+        efs_logs = FileSystem(
+            self,
+            "DorpsGekLogsEFS",
+            vpc=vpc,
+        )
+        efs_logs.connections.allow_default_port_from(cluster)
+
         if deployment == Deployment.PRODUCTION:
             desired_count = 1
             priority = 30
+            addressed_by = "@"
+            irc_username = "DorpsGek"
+            channels = [
+                "--channel",
+                "dorpsgek",
+                "--channel",
+                "openttd,public",
+                "--channel",
+                "openttd.dev,public",
+                "--channel",
+                "openttd.notice",
+                "--channel",
+                "openttd.tgp",
+                "--channel",
+                "opendune,public",
+            ]
         else:
-            # This container only runs in production, as having multiple of
-            # them currently serves no purpose.
-            return
+            desired_count = 1
+            priority = 130
+            addressed_by = "%"
+            irc_username = "DorpsGek_ivs"
+            channels = [
+                "--channel",
+                "dorpsgek",
+                "--channel",
+                "dorpsgek-test,public",
+            ]
 
-        sentry_dsn = parameter_store.add_secure_string("/Dorpsgek/SentryDSN").parameter
-        github_app_id = parameter_store.add_secure_string("/Dorpsgek/GithubAppId").parameter
-        github_app_private_key = parameter_store.add_secure_string("/Dorpsgek/GithubAppPrivateKey").parameter
-        github_app_secret = parameter_store.add_secure_string("/Dorpsgek/GithubAppSecret").parameter
+        sentry_dsn = parameter_store.add_secure_string(f"/Dorpsgek/{deployment.value}/SentryDSN").parameter
+        github_app_id = parameter_store.add_secure_string(f"/Dorpsgek/{deployment.value}/GithubAppId").parameter
+        github_app_private_key = parameter_store.add_secure_string(f"/Dorpsgek/{deployment.value}/GithubAppPrivateKey").parameter
+        github_app_secret = parameter_store.add_secure_string(f"/Dorpsgek/{deployment.value}/GithubAppSecret").parameter
+        nickserv_password = parameter_store.add_secure_string(f"/Dorpsgek/{deployment.value}/NickservPassword").parameter
 
         ECSHTTPSContainer(
             self,
@@ -48,10 +99,19 @@ def __init__(self, scope: Construct, id: str, *, deployment: Deployment, policy:
             application_name=self.application_name,
             image_name="ghcr.io/openttd/dorpsgek",
             port=80,
-            memory_limit_mib=64,
+            memory_limit_mib=96,
             desired_count=desired_count,
             cluster=cluster,
             priority=priority,
+            command=[
+                "--irc-username",
+                irc_username,
+                "--nickserv-username",
+                irc_username,
+                "--addressed-by",
+                addressed_by,
+            ]
+            + channels,
             environment={
                 "DORPSGEK_SENTRY_ENVIRONMENT": deployment.value.lower(),
             },
@@ -60,5 +120,20 @@ def __init__(self, scope: Construct, id: str, *, deployment: Deployment, policy:
                 "DORPSGEK_GITHUB_APP_ID": Secret.from_ssm_parameter(github_app_id),
                 "DORPSGEK_GITHUB_APP_PRIVATE_KEY": Secret.from_ssm_parameter(github_app_private_key),
                 "DORPSGEK_GITHUB_APP_SECRET": Secret.from_ssm_parameter(github_app_secret),
+                "DORPSGEK_NICKSERV_PASSWORD": Secret.from_ssm_parameter(nickserv_password),
+            },
+            volumes={
+                "/code/data": Volume(
+                    name="data",
+                    efs_volume_configuration=EfsVolumeConfiguration(
+                        file_system_id=efs_seen.file_system_id,
+                    ),
+                ),
+                "/code/logs/ChannelLogger": Volume(
+                    name="logs",
+                    efs_volume_configuration=EfsVolumeConfiguration(
+                        file_system_id=efs_logs.file_system_id,
+                    ),
+                ),
             },
         )