Some clean up #11
|
@ -21,7 +21,8 @@ let
|
||||||
app = "dokuwiki";
|
app = "dokuwiki";
|
||||||
domain = "eh22.easterhegg.eu";
|
domain = "eh22.easterhegg.eu";
|
||||||
dataDir = "/srv/www/${domain}";
|
dataDir = "/srv/www/${domain}";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d ${dataDir} 0755 ${app} ${app}"
|
"d ${dataDir} 0755 ${app} ${app}"
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "mqtt";
|
hostName = "mqtt";
|
||||||
domain = "z9.ccchh.net";
|
domain = "z9.ccchh.net";
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "23.11";
|
||||||
}
|
}
|
|
@ -1,9 +1,9 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
./networking.nix
|
./networking.nix
|
||||||
./mosquitto.nix
|
./mosquitto.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
|
@ -5,29 +5,29 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.mosquitto = {
|
services.mosquitto = {
|
||||||
enable = true;
|
enable = true;
|
||||||
persistence = true;
|
persistence = true;
|
||||||
|
|
||||||
# set config for all listeners
|
# set config for all listeners
|
||||||
listeners = [ {
|
listeners = [{
|
||||||
settings.allow_anonymous = true;
|
settings.allow_anonymous = true;
|
||||||
omitPasswordAuth = true;
|
omitPasswordAuth = true;
|
||||||
acl = ["topic readwrite #"];
|
acl = [ "topic readwrite #" ];
|
||||||
} ];
|
}];
|
||||||
|
|
||||||
bridges.winkekatz = {
|
bridges.winkekatz = {
|
||||||
addresses = [
|
addresses = [
|
||||||
{ address = "mqtt.winkekatze24.de"; }
|
{ address = "mqtt.winkekatze24.de"; }
|
||||||
];
|
];
|
||||||
topics = [
|
topics = [
|
||||||
"winkekatze/allcats/eye/set in 2"
|
"winkekatze/allcats/eye/set in 2"
|
||||||
"winkekatze/allcats in 2"
|
"winkekatze/allcats in 2"
|
||||||
"+/status out 2 winkekatze/ \"\""
|
"+/status out 2 winkekatze/ \"\""
|
||||||
"+/connected out 2 winkekatze/ \"\""
|
"+/connected out 2 winkekatze/ \"\""
|
||||||
];
|
];
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 1883 ];
|
networking.firewall.allowedTCPPorts = [ 1883 ];
|
||||||
}
|
}
|
|
@ -4,7 +4,8 @@ let
|
||||||
domain = "hacker.tours";
|
domain = "hacker.tours";
|
||||||
dataDir = "/var/www/${domain}";
|
dataDir = "/var/www/${domain}";
|
||||||
deployUser = "hackertours-website-deploy";
|
deployUser = "hackertours-website-deploy";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
services.nginx.virtualHosts = {
|
services.nginx.virtualHosts = {
|
||||||
"acme-${domain}" = {
|
"acme-${domain}" = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
|
|
|
@ -4,7 +4,8 @@ let
|
||||||
domain = "hackertours.hamburg.ccc.de";
|
domain = "hackertours.hamburg.ccc.de";
|
||||||
dataDir = "/var/www/${domain}";
|
dataDir = "/var/www/${domain}";
|
||||||
deployUser = "ht-ccchh-website-deploy";
|
deployUser = "ht-ccchh-website-deploy";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
services.nginx.virtualHosts = {
|
services.nginx.virtualHosts = {
|
||||||
"acme-${domain}" = {
|
"acme-${domain}" = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{...}:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -4,7 +4,8 @@ let
|
||||||
domain = "staging.hacker.tours";
|
domain = "staging.hacker.tours";
|
||||||
dataDir = "/var/www/${domain}";
|
dataDir = "/var/www/${domain}";
|
||||||
deployUser = "hackertours-website-deploy";
|
deployUser = "hackertours-website-deploy";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
services.nginx.virtualHosts = {
|
services.nginx.virtualHosts = {
|
||||||
"acme-${domain}" = {
|
"acme-${domain}" = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
|
|
|
@ -4,7 +4,8 @@ let
|
||||||
domain = "staging.hackertours.hamburg.ccc.de";
|
domain = "staging.hackertours.hamburg.ccc.de";
|
||||||
dataDir = "/var/www/${domain}";
|
dataDir = "/var/www/${domain}";
|
||||||
deployUser = "ht-ccchh-website-deploy";
|
deployUser = "ht-ccchh-website-deploy";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
services.nginx.virtualHosts = {
|
services.nginx.virtualHosts = {
|
||||||
"acme-${domain}" = {
|
"acme-${domain}" = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
description = "Yate telehony engine";
|
description = "Yate telehony engine";
|
||||||
unitConfig = {
|
unitConfig = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
After="network.target";
|
After = "network.target";
|
||||||
};
|
};
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${pkgs.yate}/bin/yate -c /yate -e /yate/share -Do";
|
ExecStart = "${pkgs.yate}/bin/yate -c /yate -e /yate/share -Do";
|
||||||
Type="simple";
|
Type = "simple";
|
||||||
Restart="always";
|
Restart = "always";
|
||||||
# ...
|
# ...
|
||||||
};
|
};
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = [ "default.target" ];
|
||||||
|
|
Loading…
Reference in a new issue