CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 3
Code Issues 1 Pull requests 2 Wiki Activity

Some clean up #11

Manually merged
jopejoe1 merged 4 commits from simple-clean-up into main 2024-11-17 19:50:37 +01:00
Conversation 0 Commits 4 Files changed 20 +64 -59
16 changed files with 64 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f7ebe660fe - Show all commits

5
config/hosts/eh22-wiki/dokuwiki.nix
View file

@ -21,7 +21,8 @@ let
app = "dokuwiki";
domain = "eh22.easterhegg.eu";
dataDir = "/srv/www/${domain}";
in {
in
{
systemd.tmpfiles.rules = [
"d ${dataDir} 0755 ${app} ${app}"
];
@ -76,7 +77,7 @@ in {
default = true;
enableACME = true;
serverName = "${domain}";
listen = [
{
addr = "0.0.0.0";

12
config/hosts/mqtt/configuration.nix
View file

@ -1,10 +1,10 @@
{ ... }:
{
networking = {
hostName = "mqtt";
domain = "z9.ccchh.net";
};
networking = {
hostName = "mqtt";
domain = "z9.ccchh.net";
};
system.stateVersion = "23.11";
}
system.stateVersion = "23.11";
}

12
config/hosts/mqtt/default.nix
View file

@ -1,9 +1,9 @@
{ pkgs, ... }:
{
imports = [
./configuration.nix
./networking.nix
./mosquitto.nix
];
}
imports = [
./configuration.nix
./networking.nix
./mosquitto.nix
];
}

44
config/hosts/mqtt/mosquitto.nix
View file

@ -5,29 +5,29 @@
{ ... }:
{
services.mosquitto = {
enable = true;
persistence = true;
services.mosquitto = {
enable = true;
persistence = true;
# set config for all listeners
listeners = [ {
settings.allow_anonymous = true;
omitPasswordAuth = true;
acl = ["topic readwrite #"];
} ];
# set config for all listeners
listeners = [{
settings.allow_anonymous = true;
omitPasswordAuth = true;
acl = [ "topic readwrite #" ];
}];
bridges.winkekatz = {
addresses = [
{ address = "mqtt.winkekatze24.de"; }
];
topics = [
"winkekatze/allcats/eye/set in 2"
"winkekatze/allcats in 2"
"+/status out 2 winkekatze/ \"\""
"+/connected out 2 winkekatze/ \"\""
];
};
bridges.winkekatz = {
addresses = [
{ address = "mqtt.winkekatze24.de"; }
];
topics = [
"winkekatze/allcats/eye/set in 2"
"winkekatze/allcats in 2"
"+/status out 2 winkekatze/ \"\""
"+/connected out 2 winkekatze/ \"\""
];
};
};
networking.firewall.allowedTCPPorts = [ 1883 ];
}
networking.firewall.allowedTCPPorts = [ 1883 ];
}

2
config/hosts/nix-box-june/users.nix
View file

@ -26,7 +26,7 @@
};
yuri = {
isNormalUser = true;
openssh.authorizedKeys.keys = [
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDdk3FLQRoCWxdOxg4kHcPqAu3QQOs/rY9na2Al2ilGl yuri@violet"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEvM35w+UaSpDTuaG5pGPgfHcfwscr+wSZN9Z5Jle82 yuri@kiara"
];

3
config/hosts/public-web-static/virtualHosts/hacker.tours.nix
View file

@ -4,7 +4,8 @@ let
domain = "hacker.tours";
dataDir = "/var/www/${domain}";
deployUser = "hackertours-website-deploy";
in {
in
{
services.nginx.virtualHosts = {
"acme-${domain}" = {
enableACME = true;

3
config/hosts/public-web-static/virtualHosts/hackertours.hamburg.ccc.de.nix
View file

@ -4,7 +4,8 @@ let
domain = "hackertours.hamburg.ccc.de";
dataDir = "/var/www/${domain}";
deployUser = "ht-ccchh-website-deploy";
in {
in
{
services.nginx.virtualHosts = {
"acme-${domain}" = {
enableACME = true;

4
config/hosts/public-web-static/virtualHosts/historic-easterhegg/default.nix
View file

@ -1,4 +1,4 @@
{...}:
{ ... }:
{
imports = [
@ -9,4 +9,4 @@
./eh11.nix
./eh20.nix
];
}
}

4
config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh03.nix
View file

@ -6,7 +6,7 @@ let
rev = "74977c56486cd060566bf06678a936e801952f9e";
hash = "sha256-ded/NO+Jex2Sa4yWAIRpqANsv8i0vKmJSkM5r9KxaVk=";
};
in
in
{
security.acme.certs."eh03.easterhegg.eu".extraDomainNames = [
"eh2003.hamburg.ccc.de"
@ -48,7 +48,7 @@ in
}];
locations."/".return = "302 https://eh03.easterhegg.eu";
extraConfig = ''
# Make use of the ngx_http_realip_module to set the $remote_addr and
# $remote_port to the client address and client port, when using proxy

8
config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh05.nix
View file

@ -48,7 +48,7 @@ in
}];
locations."/".return = "302 https://eh05.easterhegg.eu";
extraConfig = ''
# Make use of the ngx_http_realip_module to set the $remote_addr and
# $remote_port to the client address and client port, when using proxy
@ -60,7 +60,7 @@ in
real_ip_header proxy_protocol;
'';
};
"eh05.easterhegg.eu" = {
forceSSL = true;
useACMEHost = "eh05.easterhegg.eu";
@ -71,7 +71,7 @@ in
ssl = true;
proxyProtocol = true;
}];
locations."/" = {
index = "index.shtml";
root = eh05;
@ -80,7 +80,7 @@ in
default_type text/html;
# Enable SSI
ssi on;
'';
'';
};
extraConfig = ''

4
config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh07.nix
View file

@ -54,7 +54,7 @@ in
}];
locations."/".return = "302 https://eh07.easterhegg.eu";
extraConfig = ''
# Make use of the ngx_http_realip_module to set the $remote_addr and
# $remote_port to the client address and client port, when using proxy
@ -86,7 +86,7 @@ in
default_type text/html;
# Enable SSI
ssi on;
'';
'';
};
extraConfig = ''

4
config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh09.nix
View file

@ -54,7 +54,7 @@ in
}];
locations."/".return = "302 https://eh09.easterhegg.eu";
extraConfig = ''
# Make use of the ngx_http_realip_module to set the $remote_addr and
# $remote_port to the client address and client port, when using proxy
@ -86,7 +86,7 @@ in
default_type text/html;
# Enable SSI
ssi on;
'';
'';
};
extraConfig = ''
# Make use of the ngx_http_realip_module to set the $remote_addr and

4
config/hosts/public-web-static/virtualHosts/historic-easterhegg/eh11.nix
View file

@ -54,7 +54,7 @@ in
}];
locations."/".return = "302 https://eh11.easterhegg.eu";
extraConfig = ''
# Make use of the ngx_http_realip_module to set the $remote_addr and
# $remote_port to the client address and client port, when using proxy
@ -86,7 +86,7 @@ in
default_type text/html;
# Enable SSI
ssi on;
'';
'';
};
extraConfig = ''

3
config/hosts/public-web-static/virtualHosts/staging.hacker.tours.nix
View file

@ -4,7 +4,8 @@ let
domain = "staging.hacker.tours";
dataDir = "/var/www/${domain}";
deployUser = "hackertours-website-deploy";
in {
in
{
services.nginx.virtualHosts = {
"acme-${domain}" = {
enableACME = true;

3
config/hosts/public-web-static/virtualHosts/staging.hackertours.hamburg.ccc.de.nix
View file

@ -4,7 +4,8 @@ let
domain = "staging.hackertours.hamburg.ccc.de";
dataDir = "/var/www/${domain}";
deployUser = "ht-ccchh-website-deploy";
in {
in
{
services.nginx.virtualHosts = {
"acme-${domain}" = {
enableACME = true;

8
config/hosts/yate/service.nix
View file

@ -6,16 +6,16 @@
description = "Yate telehony engine";
unitConfig = {
Type = "simple";
After="network.target";
After = "network.target";
};
serviceConfig = {
ExecStart = "${pkgs.yate}/bin/yate -c /yate -e /yate/share -Do";
Type="simple";
Restart="always";
Type = "simple";
Restart = "always";
# ...
};
wantedBy = [ "default.target" ];
requiredBy = [ "network.target" ];
requiredBy = [ "network.target" ];
# ...
};
}