hacc/haccfiles
8
0
Fork 1
Code Issues 1 Pull requests Projects Releases Wiki Activity

Compare commits

merge into: hacc:mattermost-9.11
Branches Tags
hacc:main
hacc:mattermost-9.11
hacc:24_04-remove-nftables_ruleset
hacc:nicer-nftables
hacc:monit-onlyoffice-restart
hacc:mattermost-kanidm
hacc:mattermost-update
hacc:removing-nix-hexchen
hacc:onlyoffice-nix
hacc:nextcloud-docs-on-website
...
pull from: hacc:main
Branches Tags
hacc:main
hacc:mattermost-9.11
hacc:24_04-remove-nftables_ruleset
hacc:nicer-nftables
hacc:monit-onlyoffice-restart
hacc:mattermost-kanidm
hacc:mattermost-update
hacc:removing-nix-hexchen
hacc:onlyoffice-nix
hacc:nextcloud-docs-on-website

19 commits
mattermost ... main

Author SHA1 Message Date
stuebinm
0caa57a30e update inputs 2024-10-21 18:50:12 +02:00
stuebinm
60c661317c update inputs 2024-10-14 13:30:09 +02:00
Moira Hösel
a5dd06225b
parsons/nftables: don't log refused connections 2024-10-11 14:22:52 +02:00
Moira Hösel
1d92eb6de9
flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/90fe4c0103687f9c6124b783762deee2561d335a' (2024-10-07)
  → 'github:NixOS/nixpkgs/c505ebf777526041d792a49d5f6dd4095ea391a7' (2024-10-11)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/dbddb7982786880db5849eef097107bceef1b165' (2024-10-07)
  → 'github:NixOS/nixpkgs/7045aa75c71e90ae3bbb486d35414b08add9c424' (2024-10-11)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/2750ed784e93e745a33fb55be7c2657adfb57c00' (2024-10-06)
  → 'github:Mic92/sops-nix/06535d0e3d0201e6a8080dd32dbfde339b94f01b' (2024-10-08)
 2024-10-11 14:17:24 +02:00
Moira Hösel
2d99878838
mattermost: 9.11.2 → 9.11.3 
this is a security release. announcement by upstream:
https://mattermost.com/blog/mattermost-security-updates-10-0-1-9-11-3-esr-9-5-11-esr-released/
 2024-10-11 14:16:18 +02:00
stuebinm
da3795d35b update inputs 2024-10-07 15:54:27 +02:00
Moira Hösel
41670c996f
flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e91cee8db967c83f041119233779caa73ff5f328' (2024-09-29)
  → 'github:NixOS/nixpkgs/6adbd5b505bb0255c30c6e9b22b5f345601afc46' (2024-10-02)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/a6d0207fea9212d28cd3d487efe6bc699663b93a' (2024-09-30)
  → 'github:NixOS/nixpkgs/c98ddb920493f24dd57ea34a18dafdbd16eeace0' (2024-10-03)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/127a96f49ddc377be6ba76964411bab11ae27803' (2024-09-27)
  → 'github:Mic92/sops-nix/3198a242e547939c5e659353551b0668ec150268' (2024-09-30)
 2024-10-03 12:50:20 +02:00
stuebinm
b409d603a9 update inputs 2024-09-30 14:47:42 +02:00
stuebinm
6cd10a640c mattermost: 9.11.1 → 9.11.2 
this is a security release. announcement by upstream:
https://mattermost.com/blog/mattermost-security-updates-9-11-2-esr-9-10-3-9-5-10-esr-released/
 2024-09-27 15:22:05 +02:00
stuebinm
cb7975e778 update inputs 2024-09-23 17:48:25 +02:00
stuebinm
697bbedd41 update inputs 2024-09-16 13:43:49 +02:00
stuebinm
2ef1aeca1b update inputs 2024-09-09 12:00:17 +02:00
stuebinm
d27d9e8722 update inputs 2024-09-02 20:39:22 +02:00
stuebinm
c295604a13 flake.nix: expose mattermost under packages.* 
this makes it easier to update, e.g. by doing "nix-update -F
mattermost".
 2024-08-30 17:56:10 +02:00
stuebinm
4dc9cdac91 flake.nix: move websites from packages.* to apps.* 
this should not change their behaviour with "nix run", which was
the reason for putting them there in the first place (however, it does
remove the ability to build them with "nix build", but afaik this has
never been used by anyone).

This means the packages.* output is now left unused, so we can use it
instead for things that actually are programs which want to expose
(see the next commit after this one for an example).
 2024-08-30 17:55:03 +02:00
stuebinm
67da5a7c8a mattermost 9.11.0 → 9.11.1 
this is a security release. announcement by upstream:
https://mattermost.com/blog/mattermost-security-updates-9-11-1-9-10-2-9-9-3-9-5-9-esr-released/
 2024-08-30 17:41:49 +02:00
stuebinm
272b3e6e51 update inputs 2024-08-28 13:31:50 +02:00
stuebinm
4d5e82a0d9 mattermost: disable the big blue buttom plugin 
this has not been used for quite some time, and since the new mattermost
version displays the plugin's button more prominently it's now definitly
time to remove this.
 2024-08-19 22:05:03 +02:00
stuebinm
1cc938a0b8 update inputs 2024-08-19 21:30:40 +02:00
11 changed files with 40 additions and 36 deletions
Show stats Expand all files Collapse all files

24
flake.lock
View file

@ -25,11 +25,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1718194053, "lastModified": 1727447169,
"narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723311493, "lastModified": 1729489324,
"narHash": "sha256-aA1JNhFh97BHPTXoJvcvgG4VSyjx0U1wT2EivxMp77o=", "narHash": "sha256-xAa7WPbtymWsI/15oC2zUBjkpHYCZ+gFMiav2lrlRH8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c306d09c1dc6492442ae4af0d1ba575869c41fc3", "rev": "e2589a4d25269cfa6a22022d01cd740d8abaa82b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +120,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1723418128, "lastModified": 1729493358,
"narHash": "sha256-k1pEqsnB6ikZyasXbtV6A9akPZMKlsyENPDUA6PXoJo=", "narHash": "sha256-Ti+Y9nWt5Fcs3JlarxLPgIOVlbqQo7jobz/qOwOaziM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "129f579cbb5b4c1ad258fd96bdfb78eb14802727", "rev": "a5e6a9e979367ee14f65d9c38119c30272f8455f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723454404, "lastModified": 1729394972,
"narHash": "sha256-Zhcf1TMDYb0BxDHKhEKCKFb1qi2vwlX0BgJPwk9Gd3E=", "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ab2d1ffeb5b85da2f6537beb2fe05da54276c261", "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
flake.nix
View file

@ -73,11 +73,20 @@
(system: deployLib: deployLib.deployChecks self.deploy) (system: deployLib: deployLib.deployChecks self.deploy)
deploy-rs.lib; deploy-rs.lib;
packages.x86_64-linux = apps.x86_64-linux =
let let
websites = self.nixosConfigurations.parsons.config.hacc.websites.builders; mkApp = pkg: {
type = "app";
program = pkgs.lib.getExe pkg;
};
websites = pkgs.lib.mapAttrs (name: mkApp)
self.nixosConfigurations.parsons.config.hacc.websites.builders;
in in
{ docs = websites."docs.hacc.space"; } // websites; { docs = websites."docs.hacc.space"; } // websites;
packages.x86_64-linux = {
inherit (pkgs) mattermost;
};
}; };
} }

6
parsons/mattermost.nix
View file

@ -144,18 +144,12 @@
Enable = true; Enable = true;
EnableUploads = true; EnableUploads = true;
Plugins = { Plugins = {
bigbluebutton = {
adminonly = false;
base_url = "https://bbb.infra4future.de/bigbluebutton/api";
salt = "zKCsNeaEniC115ynHOsZopgA4iTiJjzgeiPNoCEc";
};
"com.github.matterpoll.matterpoll" = { "com.github.matterpoll.matterpoll" = {
experimentalui = true; experimentalui = true;
trigger = "poll"; trigger = "poll";
}; };
}; };
PluginStates = { PluginStates = {
bigbluebutton.Enable = true;
"com.github.matterpoll.matterpoll".Enable = true; "com.github.matterpoll.matterpoll".Enable = true;
}; };
}; };

1
parsons/nftables.nix
View file

@ -2,6 +2,7 @@
{ {
networking.firewall.enable = true; networking.firewall.enable = true;
networking.firewall.logRefusedConnections = false;
networking.nat.enable = true; networking.nat.enable = true;
networking.nftables.enable = true; networking.nftables.enable = true;

8
pkgs/mattermost.nix
View file

@ -12,13 +12,13 @@ buildGoModule rec {
# See https://docs.mattermost.com/upgrade/extended-support-release.html # See https://docs.mattermost.com/upgrade/extended-support-release.html
# When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update
# the version regex in passthru.updateScript as well. # the version regex in passthru.updateScript as well.
version = "9.11.0"; version = "9.11.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mattermost"; owner = "mattermost";
repo = "mattermost"; repo = "mattermost";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Qs5/f2wltG7HRTOVxfS+6C9CP+NR475ix/4XHezKxIc="; hash = "sha256-CuFkydl1ZZUAWmrDIV1Jp9S6jIKYmglAe5XW2lTRgtQ=";
}; };
# Needed because buildGoModule does not support go workspaces yet. # Needed because buildGoModule does not support go workspaces yet.
@ -34,10 +34,10 @@ buildGoModule rec {
webapp = fetchurl { webapp = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
hash = "sha256-KT8hYVhjAvSluqnZ2IGX9RdCb8EqLtIyQuIKJkf+9No="; hash = "sha256-4JzhL2+G3T98pNFgKugs/eoSrbm7QSk5grVlprrIKEI=";
}; };
vendorHash = "sha256-0rxLt2ODlGsC3z5qw7m7QsverKrTtWicnHep4+fDD3M="; vendorHash = "sha256-Gwv6clnq7ihoFC8ox8iEM5xp/us9jWUrcmqA9/XbxBE=";
modRoot = "./server"; modRoot = "./server";
preBuild = '' preBuild = ''

4
websites/docs.hacc.space/default.nix
View file

@ -1,4 +1,4 @@
{ copyPathToStore, stdenvNoCC, zola, writeScriptBin }: { copyPathToStore, stdenvNoCC, zola, writeShellScriptBin }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "docs.hacc.space-static"; name = "docs.hacc.space-static";
@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
zola build --output-dir $out zola build --output-dir $out
''; '';
watch = writeScriptBin "watch" '' watch = writeShellScriptBin "watch" ''
cd $(git rev-parse --show-toplevel)/websites/docs.hacc.space cd $(git rev-parse --show-toplevel)/websites/docs.hacc.space
${zola}/bin/zola serve --output-dir /tmp/hacc-docs "$@" ${zola}/bin/zola serve --output-dir /tmp/hacc-docs "$@"
''; '';

4
websites/hacc.earth/default.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoCC, sfz, writeScriptBin }: { stdenvNoCC, sfz, writeShellScriptBin }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "hacc.earth-static"; name = "hacc.earth-static";
@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
rm $out/default.nix rm $out/default.nix
''; '';
watch = writeScriptBin "watch" '' watch = writeShellScriptBin "watch" ''
cd $(git rev-parse --show-toplevel)/websites/hacc.earth cd $(git rev-parse --show-toplevel)/websites/hacc.earth
${sfz}/bin/sfz "$@" ${sfz}/bin/sfz "$@"
''; '';

4
websites/help.studentsforfuture.info/default.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoCC, sfz, writeScriptBin }: { stdenvNoCC, sfz, writeShellScriptBin }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "muc.hacc.earth-static"; name = "muc.hacc.earth-static";
@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
rm $out/default.nix rm $out/default.nix
''; '';
watch = writeScriptBin "watch" '' watch = writeShellScriptBin "watch" ''
cd $(git rev-parse --show-toplevel)/websites/help.studentsforfuture.info cd $(git rev-parse --show-toplevel)/websites/help.studentsforfuture.info
${sfz}/bin/sfz "$@" ${sfz}/bin/sfz "$@"
''; '';

4
websites/infra4future.de/default.nix
View file

@ -1,4 +1,4 @@
{ jekyll, stdenvNoCC, writeScriptBin }: { jekyll, stdenvNoCC, writeShellScriptBin }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "infra4future.de-static"; name = "infra4future.de-static";
@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
${jekyll}/bin/jekyll build -d $out --disable-disk-cache ${jekyll}/bin/jekyll build -d $out --disable-disk-cache
''; '';
watch = writeScriptBin "watch" '' watch = writeShellScriptBin "watch" ''
cd $(git rev-parse --show-toplevel)/websites/infra4future.de cd $(git rev-parse --show-toplevel)/websites/infra4future.de
rm -rf /tmp/hacc-website rm -rf /tmp/hacc-website
${jekyll}/bin/jekyll serve --disable-disk-cache -d /tmp/hacc-website "$@" ${jekyll}/bin/jekyll serve --disable-disk-cache -d /tmp/hacc-website "$@"

4
websites/muc.hacc.earth/default.nix
View file

@ -1,4 +1,4 @@
{ stdenvNoCC, sfz, writeScriptBin }: { stdenvNoCC, sfz, writeShellScriptBin }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "muc.hacc.earth-static"; name = "muc.hacc.earth-static";
@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
rm $out/default.nix rm $out/default.nix
''; '';
watch = writeScriptBin "watch" '' watch = writeShellScriptBin "watch" ''
cd $(git rev-parse --show-toplevel)/websites/muc.hacc.earth cd $(git rev-parse --show-toplevel)/websites/muc.hacc.earth
${sfz}/bin/sfz "$@" ${sfz}/bin/sfz "$@"
''; '';

4
websites/mumble.infra4future.de/default.nix
View file

@ -1,4 +1,4 @@
{ jekyll, stdenvNoCC, writeScriptBin }: { jekyll, stdenvNoCC, writeShellScriptBin }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
name = "mumble.infra4future.de-static"; name = "mumble.infra4future.de-static";
@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
${jekyll}/bin/jekyll build -d $out --disable-disk-cache ${jekyll}/bin/jekyll build -d $out --disable-disk-cache
''; '';
watch = writeScriptBin "watch" '' watch = writeShellScriptBin "watch" ''
cd $(git rev-parse --show-toplevel)/websites/mumble.infra4future.de cd $(git rev-parse --show-toplevel)/websites/mumble.infra4future.de
rm -rf /tmp/hacc-website rm -rf /tmp/hacc-website
${jekyll}/bin/jekyll serve --disable-disk-cache -d /tmp/hacc-website "$@" ${jekyll}/bin/jekyll serve --disable-disk-cache -d /tmp/hacc-website "$@"