Lillian-Violet/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Some edits and sops

Browse source
This commit is contained in:
Lillian Violet 2023-11-20 20:26:17 +01:00
parent 26bb9286f0
commit 28c3e3e30f
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/queen/configuration.nix
View file

@ -83,7 +83,7 @@
noto-fonts-emoji-blob-bin noto-fonts-emoji-blob-bin
noto-fonts-emoji noto-fonts-emoji
oh-my-zsh oh-my-zsh
postgresql_16 mariadb_110
rsync rsync
wget wget
zsh zsh

19
nixos/queen/nextcloud.nix
View file

@ -44,15 +44,17 @@
configureRedis = true; configureRedis = true;
package = pkgs.nextcloud27;
config = { config = {
# Further forces Nextcloud to use HTTPS # Further forces Nextcloud to use HTTPS
overwriteProtocol = "https"; overwriteProtocol = "https";
# Nextcloud PostegreSQL database configuration, recommended over using SQLite # Nextcloud PostegreSQL database configuration, recommended over using SQLite
dbtype = "pgsql"; dbtype = "mysql";
dbuser = "nextcloud"; dbuser = "nextcloud";
dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbhost = "/run/mysql";
dbname = "nextcloud"; dbname = "NC";
dbpassFile = config.sops.secrets."nextclouddb".path; dbpassFile = config.sops.secrets."nextclouddb".path;
#TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration
@ -61,21 +63,22 @@
}; };
}; };
services.postgresql = { services.mysql = {
enable = true; enable = true;
package = pkgs.mariadb_110;
# Ensure the database, user, and permissions always exist # Ensure the database, user, and permissions always exist
ensureDatabases = ["nextcloud"]; ensureDatabases = ["NC"];
ensureUsers = [ ensureUsers = [
{ {
name = "nextcloud"; name = "nextcloud";
ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; ensurePermissions."DATABASE NC" = "ALL PRIVILEGES";
} }
]; ];
}; };
systemd.services."nextcloud-setup" = { systemd.services."nextcloud-setup" = {
requires = ["postgresql.service"]; requires = ["mysql.service"];
after = ["postgresql.service"]; after = ["mysql.service"];
}; };
} }

1
nixos/shared-desktop/configuration.nix
View file

@ -62,6 +62,7 @@
home-manager home-manager
input-leap input-leap
libsForQt5.discover libsForQt5.discover
libsForQt5.kcalc
libsForQt5.kdepim-addons libsForQt5.kdepim-addons
libsForQt5.kirigami2 libsForQt5.kirigami2
libsForQt5.kdeconnect-kde libsForQt5.kdeconnect-kde

6
secrets/queen-Lillian.yaml
View file

@ -1,5 +1,5 @@
nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str] nextcloudadmin: ENC[AES256_GCM,data:LqgutUXs1msmFUNa+4JI1BEq0R8=,iv:sLP52reqsJfUNQnA9MbtbcZjGeluHDaO3dlHpWCLU4M=,tag:ChG/hZIMcmc0wt2AWOBNCA==,type:str]
nextclouddb: ENC[AES256_GCM,data:Jl2Lz2n64tQYVmj0t/ZIfae3KNk=,iv:e/ne3VfIMhCX1ohgGyhFK2tHGwuXJGFhxtNIR0ZHe3I=,tag:Vr1Nn2279t91LvD1XVbJKg==,type:str] nextclouddb: ENC[AES256_GCM,data:EFwVtVD4KnEiZ5SM+1XW0U0mR/I2IXcRYXhQTgwv788=,iv:blHbNqI/Gq4tUQuqKWgrX9tYj6XKLRrWl1LFN+cn71M=,tag:H/7vobp5OwPbqsapvw7mUw==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -15,8 +15,8 @@ sops:
KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz
NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-11-20T14:35:52Z" lastmodified: "2023-11-20T16:04:50Z"
mac: ENC[AES256_GCM,data:IZg0gpsnLu4/dSjeiV3nf2ZW+ifq3FvshLeYE/fNOpNWTdCRm8OhCJNxY0kTuTBae7vCQXcjUQHCuAd+1eZPQD4juBOUd7CVOE5Chn4/o01HyEncjBjwha7uxLazqe15Q3gIFxC+8vqnAbV1BVTh1gIpkSaM61nE8Thr5sE8kvg=,iv:Dg8tUPT2V+IQK7/7DhrZHcnWoxC1APwQcM9owTzU+PU=,tag:qbypt7U5r0O3RRuNdOswIQ==,type:str] mac: ENC[AES256_GCM,data:eXTRcUy7s6NGN7ziA4CFz1Z3bhF0nNWtVI5o/WwMg7UFmW8AhJ2Hjzp0AJSkQxZOav2Fu/t9ENsu3OTdx3khxk9a1M8BV5VqJQ/DmXXfuZjjJ5cqYDBdQqDI+E6Ai6BJHHN0A4r5xkQ7fpdXsolshJKXi9sNiAjYY3zoJi3id9Y=,iv:d214ZHFIm/KmgzYBZrRm58yFZol/dfw6twZthFOAgvY=,tag:2Z4P0iCYNSNiIc2PwW733Q==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1