Skip to content

Commit c32bc0e

Browse files
authored
Merge branch 'main' into feat/grafana-postgresql
2 parents 8f42f9a + 237a8de commit c32bc0e

4 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,5 @@ jobs:
4949
run: |
5050
attic push rc:main ./result
5151
attic push rc:main $(which attic)
52+
nix build .#devShells.${{ matrix.system }}.default -o ./result-devshell
53+
attic push rc:main ./result-devshell

‎.github/workflows/deploy.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ on:
77
branches: [main]
88
workflow_dispatch:
99

10-
concurrency:
11-
group: deploy
12-
cancel-in-progress: false
13-
1410
jobs:
1511
deploy:
1612
if: >-
1713
github.event_name == 'workflow_dispatch' ||
1814
github.event.workflow_run.conclusion == 'success'
15+
concurrency:
16+
group: deploy-${{ matrix.host }}
17+
cancel-in-progress: false
1918
strategy:
2019
matrix:
2120
include:

‎hosts/glyph/services/db.nix‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
port = 5432;
1313
max_connections = 150;
1414
};
15-
ensureDatabases = ["atticd" "grafana" "pocketid"];
15+
ensureDatabases = ["atticd" "grafana" "open-webui" "pocketid"];
1616
ensureUsers = [
1717
{
1818
name = "atticd";
@@ -22,6 +22,10 @@
2222
name = "grafana";
2323
ensureDBOwnership = true;
2424
}
25+
{
26+
name = "open-webui";
27+
ensureDBOwnership = true;
28+
}
2529
{
2630
name = "pocketid";
2731
ensureDBOwnership = true;
@@ -31,6 +35,6 @@
3135

3236
services.postgresqlBackup = {
3337
enable = true;
34-
databases = ["atticd" "grafana" "pocketid"];
38+
databases = ["atticd" "grafana" "open-webui" "pocketid"];
3539
};
3640
}

‎hosts/glyph/services/open-webui.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
OAUTH_ALLOWED_ROLES = "users, admins";
2828
OAUTH_ADMIN_ROLES = "admins";
2929
ENABLE_LOGIN_FORM = "false";
30+
DATABASE_URL = "postgresql:///open-webui?host=/run/postgresql";
3031
};
3132
};
3233
}

0 commit comments

Comments
 (0)