summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/bgt
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-05-15 14:26:42 +0200
committerlassulus <lassulus@lassul.us>2021-05-15 14:26:42 +0200
commit35aa5ac31dc35f2e14bfb3222ac33381a640ad89 (patch)
tree6a2babb27c771b7e16dca4c4a302fd6e10054e38 /makefu/2configs/bgt
parent7e018afe85af22916f070a242d9d1667791e3457 (diff)
parent5bf33d683cbf6f43599ae97aa1c56b1fd0d7d3f3 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/bgt')
-rw-r--r--makefu/2configs/bgt/etherpad.euer.krebsco.de.nix11
-rw-r--r--makefu/2configs/bgt/social-to-irc.nix11
-rw-r--r--makefu/2configs/bgt/template.md1
3 files changed, 19 insertions, 4 deletions
diff --git a/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix b/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix
index 48b947c58..cf5b22bae 100644
--- a/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix
+++ b/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix
@@ -30,8 +30,12 @@ in {
proxy_read_timeout 1799s;
'';
};
- docker-containers."etherpad-lite" = {
- image = "makefoo/bgt-etherpad:2020-05-02.6";
+ state = [ "/var/lib/docker/volumes/etherpad_data/_data/" ];
+ virtualisation.oci-containers.containers."etherpad-lite" = {
+ image = "makefoo/bgt-etherpad:2021-04-16.3"; # --build-arg ETHERPAD_PLUGINS="ep_markdown"
+ # ep_codepad does not work anymore
+
+ #image = "etherpad/etherpad:1.8.13";
ports = [ "127.0.0.1:${toString port}:9001" ];
volumes = [
"/var/src/secrets/etherpad/apikey:/opt/etherpad-lite/APIKEY.txt"
@@ -46,7 +50,10 @@ in {
#DB_PASS=mypassword
environment = {
# ADMIN_PASSWORD = "auf jeden fall nicht das echte admin passwort";
+ # LOGLEVEL = "DEBUG";
+
SUPPRESS_ERRORS_IN_PAD_TEXT = "true";
+ TRUST_PROXY = "true";
TITLE = "Binärgewitter Etherpad";
SKIN_NAME = "no-skin";
DEFAULT_PAD_TEXT = builtins.replaceStrings ["\n"] ["\\n"] (builtins.readFile ./template.md);
diff --git a/makefu/2configs/bgt/social-to-irc.nix b/makefu/2configs/bgt/social-to-irc.nix
index dc975c359..8e81f9b50 100644
--- a/makefu/2configs/bgt/social-to-irc.nix
+++ b/makefu/2configs/bgt/social-to-irc.nix
@@ -1,10 +1,17 @@
+{ pkgs, ... }:
{
- # systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG";
+ systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG";
+ systemd.services.restart-brockman = {
+ after = [ "brockman.service" ];
+ wantedBy = [ "multi-user.target" ];
+ startAt = "daily";
+ script = "${pkgs.systemd}/bin/systemctl try-restart brockman.service";
+ };
krebs.brockman = {
enable = true;
config = {
channel = "#binaergewitter";
- notifyErrors = false;
+ notifyErrors = false;
irc = {
host = "irc.freenode.net";
port = 6667;
diff --git a/makefu/2configs/bgt/template.md b/makefu/2configs/bgt/template.md
index d30cb49eb..af5de0697 100644
--- a/makefu/2configs/bgt/template.md
+++ b/makefu/2configs/bgt/template.md
@@ -21,6 +21,7 @@
## Vorschläge
### Backlog von Picks und Lesefoo aus der letzten Woche
+die Nachfolgenden 3 Striche sind sehr wichtig, bitte nicht löschen
---
## Blast from the Past