Compare commits

...

8 Commits

Author SHA1 Message Date
Vegard Bieker Matthey
be221d5c8d use correct setting for password 2026-03-18 18:39:17 +01:00
Vegard Bieker Matthey
fcd9d52cd9 fix negative number for credit limit 2026-03-18 16:55:41 +01:00
Vegard Bieker Matthey
b5dc63d54c set some defaults for dibblerSettings 2026-03-18 16:36:35 +01:00
Vegard Bieker Matthey
c0c08ba23b only use a-Z and 0-9 for worblehat password 2026-03-18 15:57:17 +01:00
Vegard Bieker Matthey
34b6bf9969 change name of database for worblehat 2026-03-18 14:43:44 +01:00
Vegard Bieker Matthey
723cce2feb fix typo 2026-03-18 14:14:12 +01:00
Vegard Bieker Matthey
dfee866de6 set defaults for worblehat settings 2026-03-18 14:01:44 +01:00
Vegard Bieker Matthey
c1525f2ae5 actually use dibbler and worblehat settings 2026-03-18 13:49:55 +01:00
3 changed files with 64 additions and 14 deletions

View File

@@ -60,10 +60,10 @@
database = { database = {
type = "postgresql"; type = "postgresql";
postgresql = { postgresql = {
username = "pvv_vv"; username = "worblehat";
dbname = "pvv_vv"; dbname = "worblehat";
host = "postgres.pvv.ntnu.no"; host = "postgres.pvv.ntnu.no";
password_file = config.sops.secrets."worblehat/postgresql/password".path; password = config.sops.secrets."worblehat/postgresql/password".path;
}; };
}; };
}; };

View File

@@ -123,19 +123,69 @@ in
groups.drumknotty = { }; groups.drumknotty = { };
}; };
services.worblehat.settings = { services.drumknotty.dibblerSettings = {
logging = { limits = {
debug = true; low_credit_warning_limit = lib.mkDefault (-100);
dbug_sql = false; user_recent_transaction_limit = lib.mkDefault 100;
}; };
database = { printer = {
type = "sqlite"; label_type = lib.mkDefault "62";
sqlite.path = "./worblehat.sqlite"; label_rotate = lib.mkDefault false;
}; };
}; };
services.dibbler.settings.database = lib.mkIf cfg.createLocalDatabase { services.drumknotty.worblehatSettings = {
logging = {
debug = lib.mkDefault true;
debug_sql = lib.mkDefault false;
};
database = {
type = lib.mkDefault "sqlite";
sqlite.path = lib.mkDefault "./worblehat.sqlite";
postgresql = {
host = lib.mkDefault "localhost";
port = lib.mkDefault 5432;
username = lib.mkDefault "worblehat";
password = lib.mkDefault "/var/lib/worblehat/db-password";
database = lib.mkDefault "worblehat";
};
};
flask = {
TESTING = lib.mkDefault true;
DEBUG = lib.mkDefault true;
FLASK_ENV = lib.mkDefault "development";
SECRET_KEY = lib.mkDefault "change-me";
};
smtp = {
enabled = lib.mkDefault false;
host = lib.mkDefault "smtp.pvv.ntnu.no";
port = lib.mkDefault 587;
username = lib.mkDefault "worblehat";
password = lib.mkDefault "/var/lib/worblehat/smtp-password";
from = lib.mkDefault "worblehat@pvv.ntnu.no";
subject_prefix = lib.mkDefault "[Worblehat]";
};
deadline_daemon = {
enabled = lib.mkDefault true;
dryrun = lib.mkDefault false;
warn_days_before_borrowing_deadline = lib.mkDefault [
5
1
];
days_before_queue_position_expires = lib.mkDefault 14;
warn_days_before_expiring_queue_position_deadline = lib.mkDefault [
3
1
];
};
};
services.drumknotty.dibblerSettings.database = lib.mkIf cfg.createLocalDatabase {
type = "postgresql"; type = "postgresql";
postgresql.host = "/run/postgresql"; postgresql.host = "/run/postgresql";
}; };

View File

@@ -3,7 +3,7 @@ dibbler:
password: ENC[AES256_GCM,data:3X9A3jOpFVRuBg0gRiCEsZVKfLI=,iv:XC7LBNUhALk9IEhItV8fO5p/m7VKL0REBY1W2IZt7G4=,tag:l18R7EhbOlucZHFQiEvpHw==,type:str] password: ENC[AES256_GCM,data:3X9A3jOpFVRuBg0gRiCEsZVKfLI=,iv:XC7LBNUhALk9IEhItV8fO5p/m7VKL0REBY1W2IZt7G4=,tag:l18R7EhbOlucZHFQiEvpHw==,type:str]
worblehat: worblehat:
postgresql: postgresql:
password: ENC[AES256_GCM,data:5xEiz+Op0dpxO/x75iEZs0VVqhbr+85BusXGt7xyQZk=,iv:MvnRPx+segcEzUzQsJXGXDaQlKpf5AN9pSfXP34Cz6k=,tag:AG8JUl3+8ZJz+gbLti78Vw==,type:str] password: ENC[AES256_GCM,data:WpJR6MumY+7WUYdVVgAqv1af+NmqecTMO9aP5lidSpE=,iv:7aoN8mjXckd81LxasMSG3R2vqj0SvzSl7wrEQ1LwToo=,tag:zeeNcEpkYnqyd8be0ZS+kQ==,type:str]
sops: sops:
age: age:
- recipient: age1hzkvnktkr8t5gvtq0ccw69e44z5z6wf00n3xhk3hj24emf07je5s6q2evr - recipient: age1hzkvnktkr8t5gvtq0ccw69e44z5z6wf00n3xhk3hj24emf07je5s6q2evr
@@ -69,8 +69,8 @@ sops:
MmxPMWNPYzJiOFRqY2VYczhvRm5IR3cKpUVV+zsMolsHI2YK9YqC6ecNT6QXv0TV MmxPMWNPYzJiOFRqY2VYczhvRm5IR3cKpUVV+zsMolsHI2YK9YqC6ecNT6QXv0TV
d1SpXRAexZBeWCCHBjSdvQBl8AT4EwrAIP2M2o++6i5DaGoGiEIWZQ== d1SpXRAexZBeWCCHBjSdvQBl8AT4EwrAIP2M2o++6i5DaGoGiEIWZQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2026-03-17T15:30:20Z" lastmodified: "2026-03-18T14:56:22Z"
mac: ENC[AES256_GCM,data:byJbaGBKiW8P6Z9EAaXFIAurNPZ1Yu3H4wISL3YESGPVy5GSbMlfSTLElw8BcQNgOuLq8+BVZcRZn+UaLx7vNKfmpbOmthmrMqilcW/vmgsQ5+of+r+O9bOqqXAmlBLvB82trkLUWsPfO4hHJBfjFweLZFqzszW3t/zeLMocM18=,iv:EqiPEg0xgRPsuJfjUKg/ba10m1rqopO4gtPwKABuNk4=,tag:5l4sJxsV69ha4hf+9iBmMw==,type:str] mac: ENC[AES256_GCM,data:nBKtFmFKx/Mt9TIFnKuuznsPAXCQpc3+WIspNu5TN9TpIqw75nzYXpxIb2hxRfRu0nbjHXpBy4bkzeMi41BGkvkvV57CZyq11J5i/iIKwuvllaB1IWrdDT2u+6RH3jIspp3KoyxFWdRqcGfNma9dSmtI+1Dd5z7XaxVaoVK2QMI=,iv:6joviyJ2cXmGh/9HH7VEcoK3+4GK5I6i2N/1d65PAN0=,tag:0BFVPWL3BByJH8HbrBTKOw==,type:str]
pgp: pgp:
- created_at: "2026-02-10T20:01:32Z" - created_at: "2026-02-10T20:01:32Z"
enc: |- enc: |-