mediawiki: use upstreamed package, correct admin mail
This commit is contained in:
parent
73f937c5f6
commit
d3c494f5f7
|
@ -1,13 +1,5 @@
|
||||||
{ zentralwerk, config, lib, pkgs, ... }:
|
{ zentralwerk, config, lib, pkgs, ... }:
|
||||||
let
|
|
||||||
ourMediawiki = pkgs.mediawiki.overrideAttrs ({ pname, ... }: rec {
|
|
||||||
version = "1.38.1";
|
|
||||||
src = with lib; pkgs.fetchurl {
|
|
||||||
url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz";
|
|
||||||
sha256 = "sha256-EXNlUloN7xsgnKUIV9ZXNrYlRbh3p1NIpXqF0SZDezE=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
networking.hostName = "mediawiki";
|
networking.hostName = "mediawiki";
|
||||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||||
|
@ -65,9 +57,8 @@ in
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
package = ourMediawiki;
|
|
||||||
virtualHost = {
|
virtualHost = {
|
||||||
adminAddr = "no-reply@c3d2.com";
|
adminAddr = "no-reply@c3d2.de";
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
hostName = "wiki.c3d2.de";
|
hostName = "wiki.c3d2.de";
|
||||||
|
@ -81,8 +72,8 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
#skins = {
|
#skins = {
|
||||||
# Vector = "${ourMediawiki}/share/mediawiki/skins/Vector";
|
# Vector = "${config.services.mediawiki.package}/share/mediawiki/skins/Vector";
|
||||||
# Hector = "${ourMediawiki}/share/mediawiki/skins/Hector";
|
# Hector = "${config.services.mediawiki.package}/share/mediawiki/skins/Hector";
|
||||||
#};
|
#};
|
||||||
name = "C3D2";
|
name = "C3D2";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue