Some clean up #11

Manually merged
jopejoe1 merged 4 commits from simple-clean-up into main 2024-11-17 19:50:37 +01:00
16 changed files with 64 additions and 59 deletions
Showing only changes of commit f7ebe660fe - Show all commits

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}"
];

View file

@ -10,11 +10,11 @@
persistence = true;
# set config for all listeners
listeners = [ {
listeners = [{
settings.allow_anonymous = true;
omitPasswordAuth = true;
acl = ["topic readwrite #"];
} ];
acl = [ "topic readwrite #" ];
}];
bridges.winkekatz = {
addresses = [

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;

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;

View file

@ -1,4 +1,4 @@
{...}:
{ ... }:
{
imports = [

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;

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;

View file

@ -6,12 +6,12 @@
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" ];