pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Merge pull request 'flora-6: use renamed options in gitea.settings.server and openssh.settings' (#232) from infra-gitea-module-settings into infra
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
Reviewed-on: #232
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
This commit is contained in:
b12f 2023-07-03 14:38:57 +02:00
parent b38c378003 c36a22c556
commit e834cc685c
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -73,11 +73,10 @@
nixos = { nixos = {
imports = [(digga.lib.importOverlays ./overlays)]; imports = [(digga.lib.importOverlays ./overlays)];
overlays = [ overlays = [
deploy.overlay
(self: super: { (self: super: {
deploy-rs = { deploy-rs = {
inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs; inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
lib = super.deploy-rs.lib; lib = inputs.deploy.lib.x86_64-linux;
}; };
}) })
]; ];
@ -186,7 +185,7 @@
profilesOrder = ["system" "direnv"]; profilesOrder = ["system" "direnv"];
profiles.direnv = { profiles.direnv = {
user = "barkeeper"; user = "barkeeper";
path = self.channels.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.barkeeper; path = self.pkgs.x86_64-linux.nixos.deploy-rs.lib.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.barkeeper;
}; };
}; };
#example = { #example = {

6
hosts/flora-6/flora-6.nix
View file

@ -136,8 +136,10 @@ in {
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh = { services.openssh = {
enable = true; enable = true;
passwordAuthentication = false; settings = {
permitRootLogin = "no"; PasswordAuthentication = false;
PermitRootLogin = "no";
};
}; };
# We manage the firewall with nix, too # We manage the firewall with nix, too

10
hosts/flora-6/gitea.nix
View file

@ -25,13 +25,15 @@
type = "postgres"; type = "postgres";
passwordFile = config.age.secrets.gitea-database-password.path; passwordFile = config.age.secrets.gitea-database-password.path;
}; };
domain = "git.pub.solar";
httpAddress = "127.0.0.1";
httpPort = 3000;
lfs.enable = true; lfs.enable = true;
mailerPasswordFile = config.age.secrets.gitea-mailer-password.path; mailerPasswordFile = config.age.secrets.gitea-mailer-password.path;
rootUrl = "https://git.pub.solar";
settings = { settings = {
server = {
ROOT_URL = "https://git.pub.solar";
DOMAIN = "git.pub.solar";
HTTP_ADDR = "127.0.0.1";
HTTP_PORT = 3000;
};
mailer = { mailer = {
ENABLED = true; ENABLED = true;
PROTOCOL = "smtps"; PROTOCOL = "smtps";