From 4c063fdf9eebaf701946b1e1e30f2cd51173db37 Mon Sep 17 00:00:00 2001
From: Gustavo <gustavo@obex.pw>
Date: Mon, 23 Jan 2023 10:02:24 -0300
Subject: [PATCH 1/2] added nostream

---
 public/v4/apps/nostream.yml  | 118 +++++++++++++++++++++++++++++++++++
 public/v4/logos/nostream.png | Bin 0 -> 8541 bytes
 2 files changed, 118 insertions(+)
 create mode 100644 public/v4/apps/nostream.yml
 create mode 100644 public/v4/logos/nostream.png

diff --git a/public/v4/apps/nostream.yml b/public/v4/apps/nostream.yml
new file mode 100644
index 000000000..bd163b344
--- /dev/null
+++ b/public/v4/apps/nostream.yml
@@ -0,0 +1,118 @@
+captainVersion: 4
+services:
+  $$cap_appname-postgres:
+    image: postgres:$$cap_postgres_version
+    volumes:
+      - $$cap_appname-postgres-data:/var/lib/postgresql/data
+    restart: always
+    environment:
+      POSTGRES_DB: nostr_ts_relay
+      POSTGRES_USER: $$cap_pg_user
+      POSTGRES_PASSWORD: $$cap_pg_password
+      POSTGRES_INITDB_ARGS: $$cap_pg_initdb_args
+    caproverExtra:
+      notExposeAsWebApp: true
+
+  $$cap_appname-redis:
+    volumes:
+      - $$cap_appname-redis-data:/data
+    restart: always
+    environment:
+      REDIS_PASSWORD: $$cap_redis_password
+    caproverExtra:
+      dockerfileLines:
+        - FROM redis:$$cap_redis_version
+        - CMD exec redis-server --requirepass "$REDIS_PASSWORD"
+      notExposeAsWebApp: true
+
+  $$cap_appname:
+    volumes:
+      - $$cap_appname-data:/.nostr
+    depends_on:
+      - $$cap_appname-postgres
+    restart: always
+    environment:
+      DB_HOST: srv-captain--$$cap_appname-postgres
+      DB_PORT: 5432
+      DB_USER: $$cap_pg_user
+      DB_NAME: nostr_ts_relay
+      DB_PASSWORD: $$cap_pg_password
+      REDIS_HOST: srv-captain--$$cap_appname-redis
+      REDIS_PORT: 6379
+      REDIS_PASSWORD: $$cap_redis_password
+      NOSTR_CONFIG_DIR: /.nostr/
+    caproverExtra:
+      containerHttpPort: "8008"
+      dockerfileLines:
+        - FROM node:18 AS build
+        - WORKDIR /build
+        - RUN git clone -b v$$cap_nostream_version --single-branch https://github.com/Cameri/nostream.git /build
+        - RUN rm -rf .git
+        - RUN npm install
+        - CMD ["npm", "run", "db:migrate"]
+        - COPY . .
+        - RUN npm run build
+        - FROM node:18-alpine3.16
+        - WORKDIR /app
+        - COPY --from=build /build/dist .
+        - RUN npm install --omit=dev --quiet
+        - RUN mkdir -p /.nostr
+        - CMD ["node", "src/index.js"]
+      notExposeAsWebApp: false
+
+caproverOneClickApp:
+  displayName: nostream
+  isOfficial: true
+  description: A Nostr Relay written in TypeScript
+  documentation: https://github.com/Cameri/nostream
+
+  instructions:
+    start: >-
+      This is a nostr relay, written in Typescript.
+
+      This implementation is production-ready.
+
+      The project master repository is available on GitHub.
+
+      For more info visit https://github.com/Cameri/nostream
+    end: |-
+      nostream has been successfully deployed!
+      --------------------------------------------
+      Before you proceed, please enable Websocket Support and force HTTPS
+      https://$$cap_root_domain/#/apps/details/$$cap_appname
+      --------------------------------------------
+      App is available as http://$$cap_appname.$$cap_root_domain
+
+  variables:
+    - id: $$cap_postgres_version
+      label: Postgres Version
+      defaultValue: "14.5-alpine"
+      description: Checkout their page for the valid tags https://hub.docker.com/_/postgres
+      validRegex: /^([^\s^\/])+$/
+    - id: $$cap_pg_user
+      label: Postgres User
+      defaultValue: nostr_ts_relay
+    - id: $$cap_pg_password
+      label: Password for postgres
+      defaultValue: $$cap_gen_random_hex(16)
+      validRegex: /^([^\s^\/])+$/
+    - id: $$cap_pg_initdb_args
+      label: Optional Arguments
+      description: >-
+        Arguments will be appended to `postgres initdb`.
+        Example: `--data-checksums`.
+      validRegex: /.{0,}/
+    - id: $$cap_redis_version
+      label: Redis Version Tag
+      description: "Check out their Docker page for the valid tags: https://hub.docker.com/_/redis?tab=tags"
+      defaultValue: "7.0"
+      validRegex: /^([^\s^\/])+$/
+    - id: $$cap_redis_password
+      label: Password for redis
+      defaultValue: $$cap_gen_random_hex(16)
+      validRegex: /^(\w|[^\s"])+$/
+    - id: $$cap_nostream_version
+      label: nostream version
+      defaultValue: 1.17.2
+      description: Check out their github page for the valid tags https://github.com/Cameri/nostream/releases
+      validRegex: /(?<major>0|[1-9]\d*)\.(?<minor>0|[1-9]\d*)\.(?<patch>0|[1-9]\d*)(?:-(?<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?/
diff --git a/public/v4/logos/nostream.png b/public/v4/logos/nostream.png
new file mode 100644
index 0000000000000000000000000000000000000000..88cd3b37d03a0aa31fe6a9aa1f978a1fafd76841
GIT binary patch
literal 8541
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

literal 0
HcmV?d00001


From 35837ba6412f9a548d70db09691fbb4641d63dee Mon Sep 17 00:00:00 2001
From: Gustavo <gustavo@obex.pw>
Date: Mon, 23 Jan 2023 23:17:42 -0300
Subject: [PATCH 2/2] fix redis user

---
 public/v4/apps/nostream.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/v4/apps/nostream.yml b/public/v4/apps/nostream.yml
index bd163b344..49fe0e4f0 100644
--- a/public/v4/apps/nostream.yml
+++ b/public/v4/apps/nostream.yml
@@ -18,6 +18,7 @@ services:
       - $$cap_appname-redis-data:/data
     restart: always
     environment:
+      REDIS_USER: default
       REDIS_PASSWORD: $$cap_redis_password
     caproverExtra:
       dockerfileLines:
@@ -39,6 +40,7 @@ services:
       DB_PASSWORD: $$cap_pg_password
       REDIS_HOST: srv-captain--$$cap_appname-redis
       REDIS_PORT: 6379
+      REDIS_USER: default
       REDIS_PASSWORD: $$cap_redis_password
       NOSTR_CONFIG_DIR: /.nostr/
     caproverExtra: