clean old config
This commit is contained in:
parent
f10ac3078e
commit
053455054d
@ -1,47 +0,0 @@
|
||||
from .observer import MultiplexingObserver, LoggingObserver, JSObserver
|
||||
|
||||
global escape
|
||||
from cgi import escape
|
||||
def signFilter(poi):
|
||||
if poi['id'] == 'Sign' or poi['id'] == 'minecraft:sign':
|
||||
return "<pre>" + "\n".join(map(escape, [poi['Text1'], poi['Text2'], poi['Text3'], poi['Text4']])) + "</pre>"
|
||||
|
||||
global json
|
||||
import json
|
||||
def petFilter(poi):
|
||||
if "CustomName" in poi:
|
||||
custom_name = json.loads(poi['CustomName'])
|
||||
if "text" in custom_name:
|
||||
return custom_name["text"]
|
||||
|
||||
def playerIcons(poi):
|
||||
if poi['id'] == 'Player':
|
||||
poi['icon'] = "https://overviewer.org/avatar/%s" % poi['EntityId']
|
||||
return "Last known location for %s" % poi['EntityId']
|
||||
|
||||
processes = 2
|
||||
|
||||
worlds["My world"] = "/var/lib/minecraft/world"
|
||||
|
||||
renders["Vue normale"] = {
|
||||
"world": "My world",
|
||||
"title": "Vue normale",
|
||||
"texturepath": "@CLIENT_JAR@",
|
||||
"rendermode": smooth_lighting,
|
||||
'markers': [dict(name="All signs", filterFunction=signFilter),
|
||||
dict(name="Pets", filterFunction=petFilter, icon="icons/marker_cat.png", createInfoWindow=False, checked=True),
|
||||
dict(name="Position joueurs", filterFunction=playerIcons),],
|
||||
}
|
||||
|
||||
cave_rendermode = [Base(), EdgeLines(), Cave(only_lit=True), DepthTinting()]
|
||||
|
||||
renders["Grottes"] = {
|
||||
"world": "My world",
|
||||
"title": "Grottes",
|
||||
"texturepath": "@CLIENT_JAR@",
|
||||
"rendermode": cave_rendermode,
|
||||
}
|
||||
|
||||
outputdir = "/var/www/minecraft-overviewer"
|
||||
|
||||
observer = MultiplexingObserver(LoggingObserver(), JSObserver(outputdir))
|
@ -20,8 +20,6 @@ let
|
||||
'';
|
||||
|
||||
backup_mail_alert = sendMail "paul@nyanlout.re" "ERREUR: Sauvegarde Borg" "Impossible de terminer la sauvegarde. Merci de voir les logs";
|
||||
|
||||
unstable = import <nixos-unstable> { };
|
||||
in
|
||||
|
||||
{
|
||||
@ -74,15 +72,6 @@ in
|
||||
};
|
||||
|
||||
services = {
|
||||
# postfix = {
|
||||
# relayHost = "mailvps.nyanlout.re";
|
||||
# relayPort = 587;
|
||||
# config = {
|
||||
# smtp_tls_cert_file = lib.mkForce "/var/lib/postfix/postfixrelay.crt";
|
||||
# smtp_tls_key_file = lib.mkForce "/var/lib/postfix/postfixrelay.key";
|
||||
# };
|
||||
# };
|
||||
|
||||
rspamd.workers.controller.extraConfig = ''
|
||||
secure_ip = ["0.0.0.0/0", "::"];
|
||||
'';
|
||||
@ -278,41 +267,6 @@ in
|
||||
host = "10.30.0.1";
|
||||
}
|
||||
];
|
||||
#tplink.switch = [
|
||||
# { host = "10.30.50.7"; }
|
||||
#];
|
||||
#sensor = [
|
||||
# {
|
||||
# platform = "template";
|
||||
# sensors = {
|
||||
# serveur_amps = {
|
||||
# friendly_name_template = "{{ states.switch.serveur.name}} Current";
|
||||
# value_template = ''{{ states.switch.serveur.attributes["current_a"] | float }}'';
|
||||
# unit_of_measurement = "A";
|
||||
# };
|
||||
# serveur_watts = {
|
||||
# friendly_name_template = "{{ states.switch.serveur.name}} Current Consumption";
|
||||
# value_template = ''{{ states.switch.serveur.attributes["current_power_w"] | float }}'';
|
||||
# unit_of_measurement = "W";
|
||||
# };
|
||||
# serveur_total_kwh = {
|
||||
# friendly_name_template = "{{ states.switch.serveur.name}} Total Consumption";
|
||||
# value_template = ''{{ states.switch.serveur.attributes["total_energy_kwh"] | float }}'';
|
||||
# unit_of_measurement = "kWh";
|
||||
# };
|
||||
# serveur_volts = {
|
||||
# friendly_name_template = "{{ states.switch.serveur.name}} Voltage";
|
||||
# value_template = ''{{ states.switch.serveur.attributes["voltage"] | float }}'';
|
||||
# unit_of_measurement = "V";
|
||||
# };
|
||||
# serveur_today_kwh = {
|
||||
# friendly_name_template = "{{ states.switch.serveur.name}} Today's Consumption";
|
||||
# value_template = ''{{ states.switch.serveur.attributes["today_energy_kwh"] | float }}'';
|
||||
# unit_of_measurement = "kWh";
|
||||
# };
|
||||
# };
|
||||
# }
|
||||
#];
|
||||
};
|
||||
};
|
||||
|
||||
@ -363,7 +317,6 @@ in
|
||||
];
|
||||
|
||||
firewall.allowedTCPPorts = [
|
||||
8448 # Matrix federation
|
||||
20 21 # FTP
|
||||
];
|
||||
|
||||
|
@ -49,14 +49,9 @@ in
|
||||
};
|
||||
|
||||
users.groups = {
|
||||
work = {};
|
||||
webdav = {};
|
||||
};
|
||||
users.users = {
|
||||
work = {
|
||||
isSystemUser = true;
|
||||
group = config.users.groups.work.name;
|
||||
};
|
||||
webdav = {
|
||||
isSystemUser = true;
|
||||
group = config.users.groups.webdav.name;
|
||||
@ -191,8 +186,6 @@ in
|
||||
'';
|
||||
};
|
||||
} // { default = true; };
|
||||
"factorio.nyanlout.re" = base { "/" = { root = "/var/www/factorio"; }; };
|
||||
"minecraft.nyanlout.re" = base { "/" = { root = "/var/www/minecraft-overviewer"; }; };
|
||||
"musique-meyenheim.fr" = base {
|
||||
"/" = {
|
||||
proxyPass = "http://unix:/run/site-musique.sock";
|
||||
@ -209,11 +202,6 @@ in
|
||||
forceSSL = true;
|
||||
globalRedirect = "musique-meyenheim.fr";
|
||||
};
|
||||
"stream.nyanlout.re" = base {
|
||||
"/" = {
|
||||
proxyPass = "http://10.30.135.71";
|
||||
};
|
||||
};
|
||||
"login.nyanlout.re" = simpleReverse config.services.nginx.sso.configuration.listen.port;
|
||||
"grafana.nyanlout.re" = authReverse config.services.grafana.settings.server.http_port;
|
||||
"transmission.nyanlout.re" = authReverse config.services.transmission.settings.rpc-port;
|
||||
@ -221,14 +209,13 @@ in
|
||||
"sonarr.nyanlout.re" = authReverse 8989;
|
||||
"syncthing.nyanlout.re" = authReverse 8384;
|
||||
"prowlarr.nyanlout.re" = authReverse 9696;
|
||||
"matrix.nyanlout.re" = simpleReverse 8008;
|
||||
"watcharr.nyanlout.re" = simpleReverse 3080;
|
||||
"emby.nyanlout.re" = recursiveUpdate (simpleReverse 8096) {
|
||||
locations."/" = {
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
"gitea.nyanlout.re" = simpleReverse config.services.gitea.settings.server.HTTP_PORT;
|
||||
"musique.nyanlout.re" = simpleReverse config.services.navidrome.settings.Port;
|
||||
"photo.nyanlout.re" = recursiveUpdate (simpleReverse config.services.photoprism.port) {
|
||||
locations."/" = {
|
||||
proxyWebsockets = true;
|
||||
@ -296,7 +283,6 @@ in
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
};
|
||||
"watcharr.nyanlout.re" = simpleReverse 3080;
|
||||
};
|
||||
};
|
||||
|
||||
@ -367,13 +353,6 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
systemd.services.phpfpm-work.serviceConfig = {
|
||||
ReadOnlyPaths = "/mnt/medias/iso_linux";
|
||||
ReadWritePaths = [
|
||||
"/mnt/medias/iso_linux/_h5ai"
|
||||
];
|
||||
};
|
||||
|
||||
systemd.services.phpfpm-drive.serviceConfig = {
|
||||
ReadWritePaths = [
|
||||
"/mnt/webdav"
|
||||
|
Loading…
Reference in New Issue
Block a user