clean up env vars

.github/workflows/deploy.yml

@@ -83,9 +83,8 @@ jobs:
         env:
           CI: true
           # keep these in sync with compose!
-          proxyHost: "http://hangar_backend:8080"
-          authHost: "https://hangar-auth.benndorf.dev"
-          host: "0.0.0.0"
+          BACKEND_HOST: "http://hangar_backend:8080"
+          AUTH_HOST: "https://hangar-auth.benndorf.dev"
           PUBLIC_HOST: "https://hangar.benndorf.dev"
         run: (cd frontend && pnpm build && cd server && pnpm build)
 
@@ -102,14 +101,10 @@ jobs:
 
       - name: Docker
         env:
-          SECRET_KEY: ${{ secrets.SECRET_KEY }}
           POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-          EMAIL_HOST_USER: ${{ secrets.EMAIL_HOST_USER }}
-          EMAIL_HOST_PASSWORD: ${{ secrets.EMAIL_HOST_PASSWORD }}
           SSO_CLIENT_ID: ${{ secrets.SSO_CLIENT_ID }}
-          SSO_SECRET: ${{ secrets.SSO_SECRET }}
-          API_KEY: ${{ secrets.API_KEY }}
+          SSO_API_KEY: ${{ secrets.SSO_API_KEY }}
           TOKEN_SECRET: ${{ secrets.TOKEN_SECRET }}
         run: |
           echo ${{ secrets.DOCKER_HOST_SSH_SIG }} > ~/.ssh/known_hosts

.github/workflows/frontend_build.yml

@@ -54,9 +54,8 @@ jobs:
         env:
           CI: true
           # keep these in sync with compose!
-          proxyHost: "http://hangar_backend:8080"
-          authHost: "https://hangar-auth.benndorf.dev"
-          host: "0.0.0.0"
+          BACKEND_HOST: "http://hangar_backend:8080"
+          AUTH_HOST: "https://hangar-auth.benndorf.dev"
           PUBLIC_HOST: "https://hangar.benndorf.dev"
         run: (cd frontend && pnpm build && cd server && pnpm build)
 

docker/deployment/docker-compose.yml

@@ -10,9 +10,8 @@ services:
       - 'backend'
     environment:
       # keep these in sync with gh-action!
-      proxyHost: "http://hangar_backend:8080"
-      authHost: "https://hangar-auth.benndorf.dev"
-      host: "0.0.0.0"
+      BACKEND_HOST: "http://hangar_backend:8080"
+      AUTH_HOST: "https://hangar-auth.benndorf.dev"
       PUBLIC_HOST: "https://hangar.benndorf.dev"
     stdin_open: true
     labels:
@@ -36,7 +35,7 @@ services:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
       SSO_CLIENT_ID: "${SSO_CLIENT_ID}"
       TOKEN_SECRET: "${TOKEN_SECRET}"
-      SSO_SECRET: "supersecret"
+      SSO_API_SECRET: "supersecret"
     depends_on:
       - 'postgres'
       - 'mail'

docker/deployment/hangar-backend/Dockerfile

@@ -6,7 +6,7 @@ ENV TERM xterm-256color
 
 EXPOSE 8080
 # "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" is for debug only
-ENTRYPOINT ["java", "-XX:+ShowCodeDetailsInExceptionMessages", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]
 
 ADD docker/deployment/hangar-backend/application.yml /hangar/application.yml
 ADD target/hangar-*.jar /hangar/app.jar

docker/deployment/hangar-backend/application.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:postgresql://postgres:5432/hangar
+    url: "jdbc:postgresql://postgres:5432/hangar"
     username: "${POSTGRES_USER}"
     password: "${POSTGRES_PASSWORD}"
 
@@ -21,7 +21,7 @@ hangar:
     auth-url: "https://hangar-auth.benndorf.dev"
     oauth-url: "https://hangar-auth.benndorf.dev/hydra"
     client-id: "${SSO_CLIENT_ID}"
-    api-key: "${SSO_SECRET}"
+    api-key: "${SSO_API_KEY}"
 
   security:
     api:

docker/deployment/hangar-frontend/Dockerfile

@@ -2,6 +2,7 @@ FROM node:16-alpine
 
 WORKDIR hangar-frontend
 ENV TERM xterm-256color
+ENV HOST 0.0.0.0
 
 EXPOSE 1337
 ENTRYPOINT ["./entrypoint.sh"]

frontend/proxy.config.ts

@@ -1,24 +1,22 @@
-const proxyHost = process.env.proxyHost || "http://localhost:8080";
-const authHost = process.env.authHost || "http://localhost:3001";
-const oauthHost = process.env.oauthHost || "http://localhost:4444";
+const backendHost = process.env.BACKEND_HOST || "http://localhost:8080";
+const authHost = process.env.AUTH_HOST || "http://localhost:3001";
 
 exports["default"] = {
   // backend
-  "/api/": proxyHost,
-  "/signup": proxyHost,
-  "/login": proxyHost,
-  "/logout": proxyHost,
-  "/handle-logout": proxyHost,
-  "/refresh": proxyHost,
-  "/invalidate": proxyHost,
-  "/v2/api-docs/": proxyHost,
-  "/robots.txt": proxyHost,
-  "/sitemap.xml": proxyHost,
-  "/global-sitemap.xml": proxyHost,
-  "/*/sitemap.xml": proxyHost,
-  "/statusz": proxyHost,
+  "/api/": backendHost,
+  "/signup": backendHost,
+  "/login": backendHost,
+  "/logout": backendHost,
+  "/handle-logout": backendHost,
+  "/refresh": backendHost,
+  "/invalidate": backendHost,
+  "/v2/api-docs/": backendHost,
+  "/robots.txt": backendHost,
+  "/sitemap.xml": backendHost,
+  "/global-sitemap.xml": backendHost,
+  "/*/sitemap.xml": backendHost,
+  "/statusz": backendHost,
   // auth
   "/avatar": authHost,
   "/oauth/logout": authHost,
-  "/oauth2": oauthHost,
 };

frontend/src/components/projects/DownloadButton.vue

@@ -95,7 +95,7 @@ const external = computed(() => false);
         rel="noopener noreferrer"
       >
         <PlatformLogo :platform="p" :size="24" class="mr-1 flex-shrink-0" />
-        {{ backendData.platforms.get(p).name }}
+        {{ backendData.platforms.get(p)?.name }}
         <span v-if="v.platformDependencies && showVersions" class="ml-1">({{ v.platformDependenciesFormatted[p] }})</span>
       </DropdownItem>
     </DropdownButton>

src/main/resources/application.yml

@@ -30,19 +30,6 @@ spring:
       WRITE_DATES_AS_TIMESTAMPS: false
     date-format: com.fasterxml.jackson.databind.util.StdDateFormat
 
-  ###############
-  # Email Stuff #
-  ###############
-#  mail:
-#    host: smtp.gmail.com
-#    username: username
-#    password: password
-#    properties:
-#      mail.transport.protocol: smtp
-#      mail.smtp.port: 587
-#      mail.smtp.auth: true
-#      mail.smtp.starttls.enable: true
-
 #############
 # Fake User #
 #############