diff options
Diffstat (limited to 'vps-configuration.env.nix')
| -rw-r--r-- | vps-configuration.env.nix | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/vps-configuration.env.nix b/vps-configuration.env.nix index 831a714..7339d85 100644 --- a/vps-configuration.env.nix +++ b/vps-configuration.env.nix @@ -7,6 +7,7 @@ let gitTLD = "$GIT_TLD"; prosodyTLD = "$PROSODY_TLD"; bonecoTLD = "$BONECO_TLD"; + pdfsTLD = "$PDFS_TLD"; letsencryptEmail = "$LETSENCRYPT_EMAIL"; authorizedKey = "$AUTHORIZED_KEY"; userPassword = "$USER_PASSWORD"; @@ -23,8 +24,7 @@ let prosodyMUCTLD = "$PROSODY_MUC_TLD"; prosodyPort = "$PROSODY_PORT"; prosodyHTTPPort = "$PROSODY_HTTP_PORT"; - matterbridgeTelegramToken = "$MATTERBRIDGE_TELEGRAM_TOKEN"; - matterbridgeTelegramChannel = "$MATTERBRIDGE_TELEGRAM_CHANNEL"; + matterbridgeWhatsappNumber = "$MATTERBRIDGE_WHATSAPP_NUMBER"; matterbridgeBotJID = "$MATTERBRIDGE_BOT_JID"; matterbridgeBotPassword = "$MATTERBRIDGE_BOT_PASSWORD"; matterbridgeBotNick = "$MATTERBRIDGE_BOT_NICK"; @@ -32,10 +32,11 @@ let matterbridgeXMPPServer = "$MATTERBRIDGE_XMPP_SERVER"; matterbridgeXMPPChannel = "$MATTERBRIDGE_XMPP_CHANNEL"; }; - boneco = pkgs.stdenv.mkDerivation { - name = "boneco"; + staticSiteFromRepo = repoName: + pkgs.stdenv.mkDerivation { + name = repoName; src = - fetchTarball "https://git.sr.ht/~euandreh/boneco/archive/master.tar.gz"; + fetchTarball "https://git.sr.ht/~euandreh/${DOLLAR}{repoName}/archive/master.tar.gz"; phases = "unpackPhase buildPhase"; buildPhase = '' mkdir ${DOLLAR}out @@ -111,7 +112,12 @@ in { "${envsubstConfiguration.bonecoTLD}" = { forceSSL = true; enableACME = true; - root = boneco; + root = staticSiteFromRepo "boneco"; + }; + "${envsubstConfiguration.pdfsTLD}" = { + forceSSL = true; + enableACME = true; + root = staticSiteFromRepo "pdfs-da-d-maria"; }; "${envsubstConfiguration.prosodyTLD}" = { forceSSL = true; @@ -184,17 +190,14 @@ in { }; }; }; - # muc = [{ - # domain = envsubstConfiguration.prosodyMUCTLD; - # }]; }; matterbridge = { enable = true; configFile = '' - [telegram.mytelegram] - Token="${envsubstConfiguration.matterbridgeTelegramToken}" - RemoteNickFormat="[{PROTOCOL}] <{NICK}>" + [whatsapp.mywhatsapp] + Number="${envsubstConfiguration.matterbridgeWhatsappNumber}" + RemoteNickFormat="[{PROTOCOL}] @<{NICK}>:" [xmpp.myxmpp] Server="${envsubstConfiguration.matterbridgeXMPPServer}" @@ -209,8 +212,8 @@ in { enable=true [[gateway.inout]] - account="telegram.mytelegram" - channel="${envsubstConfiguration.matterbridgeTelegramChannel}" + account="whatsapp.mywhatsapp" + channel="dunno" [[gateway.inout]] account="xmpp.myxmpp" |