Skip to content

Commit

Permalink
Merge pull request #99 from sinamics/organization
Browse files Browse the repository at this point in the history
[Feature] Allow admins to create an Organization.
  • Loading branch information
sinamics authored Dec 3, 2023
2 parents dd50e1e + 0d0dedc commit 5473213
Show file tree
Hide file tree
Showing 90 changed files with 6,356 additions and 1,105 deletions.
4 changes: 1 addition & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose
{
"name": "ztnet dev",
// Update the 'dockerComposeFile' list if you have more compose files or use different names.
Expand Down Expand Up @@ -35,7 +33,7 @@
"bourhaouta.tailwindshades",
"Gruntfuggly.todo-tree",
"yoavbls.pretty-ts-errors",
"rome.rome",
"biomejs.biome",
"GitHub.copilot"
]
}
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"recommendations": [
"prisma.prisma",
"rome.rome",
"biomejs.biome",
"bradlc.vscode-tailwindcss"
]
}
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ ENV NODE_ENV production
# Disable telemetry during runtime.
ENV NEXT_TELEMETRY_DISABLED 1

# adding internal url. https://github.com/sinamics/ztnet/issues/105
ENV NEXTAUTH_URL_INTERNAL http://localhost:3000

RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs
RUN apt update && apt install -y curl sudo postgresql-client && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Expand Down
3 changes: 2 additions & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"files": {
"ignore": [
"**/*.js",
"install.ztnet/**/*"
"install.ztnet/**/*",
".devcontainer/**/*"
]
},
"formatter": {
Expand Down
23 changes: 13 additions & 10 deletions docs/ztnet/docs/Installation/docker-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,16 @@ Please note that while admins have visibility over registered accounts, they **c
## Ztnet Environment Variables
The following environment variables are available for configuration. They can be set in the `.env` file or passed directly to the docker-compose.yml file.

- **ZT_ADDR** zerotier controller address. Defaults to `http://zerotier:9993` for docker environment, and `http://127.0.0.1:9993` for standalone.
- **ZT_SECRET** zerotier controller secret. Defaults to the content of `/var/lib/zerotier-one/authtoken.secret`.
- **NEXT_PUBLIC_SITE_NAME** Site name. Defaults to `ZTNET`.
- **POSTGRES_HOST** Default: postgres
- **POSTGRES_PORT** Default: 5432
- **POSTGRES_USER** Default: postgres
- **POSTGRES_PASSWORD** Default: postgres
- **POSTGRES_DB** Default: ztnet
- **NEXTAUTH_URL** Default: "http://localhost:3000" # Change `localhost` to your production domain when deploying.
- **NEXTAUTH_SECRET** Default: "random_secret", change this to a random string for security.
```bash
ZT_ADDR # zerotier controller address. Defaults to `http://zerotier:9993` for docker environment, and `http://127.0.0.1:9993` for standalone.
ZT_SECRET #zerotier controller secret. Defaults to the content of `/var/lib/zerotier-one/authtoken.secret`.
NEXT_PUBLIC_SITE_NAME #Site name. Defaults to `ZTNET`.
POSTGRES_HOST #Default: postgres
POSTGRES_PORT #Default: 5432
POSTGRES_USER #Default: postgres
POSTGRES_PASSWORD #Default: postgres
POSTGRES_DB #Default: ztnet
NEXTAUTH_URL #Default: "http://localhost:3000" # Change `localhost` to your production domain when deploying.
NEXTAUTH_URL_INTERNAL #Default: "http://localhost:3000" # Change `localhost` to your production domain when deploying.
NEXTAUTH_SECRET #Default: "random_secret", change this to a random string for security.
```
Loading

0 comments on commit 5473213

Please sign in to comment.