forked from Drift/pvv-nixos-config
bekkalokk: continue work on mediawiki service
This commit is contained in:
parent
c11a804097
commit
cd0c8c8198
|
@ -9,9 +9,9 @@
|
||||||
|
|
||||||
# TODO: set up authentication for the following:
|
# TODO: set up authentication for the following:
|
||||||
# ./services/website/website.nix
|
# ./services/website/website.nix
|
||||||
# ./services/website/nginx.nix
|
./services/website/nginx.nix
|
||||||
# ./services/website/gitea.nix
|
# ./services/website/gitea.nix
|
||||||
# ./services/website/mediawiki.nix
|
./services/website/mediawiki.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
sops.defaultSopsFile = ../../secrets/bekkalokk/bekkalokk.yaml;
|
sops.defaultSopsFile = ../../secrets/bekkalokk/bekkalokk.yaml;
|
||||||
|
|
|
@ -1,23 +1,175 @@
|
||||||
{ values, config, ... }:
|
{ pkgs, lib, config, values, ... }: let
|
||||||
{
|
cfg = config.services.mediawiki;
|
||||||
|
|
||||||
|
# "mediawiki"
|
||||||
|
user = config.systemd.services.mediawiki-init.serviceConfig.User;
|
||||||
|
|
||||||
|
# "mediawiki"
|
||||||
|
group = config.users.users.${user}.group;
|
||||||
|
in {
|
||||||
sops.secrets = {
|
sops.secrets = {
|
||||||
"mediawiki/password" = { };
|
"mediawiki/password" = {
|
||||||
"postgres/mediawiki/password" = { };
|
restartUnits = [ "mediawiki-init.service" "phpfpm-mediawiki.service" ];
|
||||||
|
owner = user;
|
||||||
|
group = group;
|
||||||
|
};
|
||||||
|
"keys/postgres/mediawiki" = {
|
||||||
|
restartUnits = [ "mediawiki-init.service" "phpfpm-mediawiki.service" ];
|
||||||
|
owner = user;
|
||||||
|
group = group;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.mediawiki = {
|
services.mediawiki = {
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "PVV";
|
name = "Programvareverkstedet";
|
||||||
passwordFile = config.sops.secrets."mediawiki/password".path;
|
passwordFile = config.sops.secrets."mediawiki/password".path;
|
||||||
|
passwordSender = "drift@pvv.ntnu.no";
|
||||||
virtualHost = {
|
|
||||||
};
|
|
||||||
|
|
||||||
database = {
|
database = {
|
||||||
type = "postgres";
|
type = "postgres";
|
||||||
host = values.bicep.ipv4;
|
host = values.hosts.postgres.ipv4;
|
||||||
port = config.services.postgresql.port;
|
port = config.services.postgresql.port;
|
||||||
passwordFile = config.sops.secrets."postgres/mediawiki/password".path;
|
passwordFile = config.sops.secrets."keys/postgres/mediawiki".path;
|
||||||
|
createLocally = false;
|
||||||
|
# TODO: create a normal database and copy over old data when the service is production ready
|
||||||
|
name = "mediawiki_test";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Host through nginx
|
||||||
|
webserver = "none";
|
||||||
|
poolConfig = let
|
||||||
|
listenUser = config.services.nginx.user;
|
||||||
|
listenGroup = config.services.nginx.group;
|
||||||
|
in {
|
||||||
|
inherit user group;
|
||||||
|
"pm" = "dynamic";
|
||||||
|
"pm.max_children" = 32;
|
||||||
|
"pm.max_requests" = 500;
|
||||||
|
"pm.start_servers" = 2;
|
||||||
|
"pm.min_spare_servers" = 2;
|
||||||
|
"pm.max_spare_servers" = 4;
|
||||||
|
"listen.owner" = listenUser;
|
||||||
|
"listen.group" = listenGroup;
|
||||||
|
"php_admin_value[error_log]" = "stderr";
|
||||||
|
"php_admin_flag[log_errors]" = "on";
|
||||||
|
"env[PATH]" = lib.makeBinPath [ pkgs.php ];
|
||||||
|
"catch_workers_output" = true;
|
||||||
|
# to accept *.html file
|
||||||
|
"security.limit_extensions" = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
extensions = {
|
||||||
|
DeleteBatch = pkgs.fetchzip {
|
||||||
|
url = "https://extdist.wmflabs.org/dist/extensions/DeleteBatch-REL1_39-995ea6f.tar.gz";
|
||||||
|
sha256 = "sha256-0F4GLCy2f5WcWIY2YgF1tVxgYbglR0VOsj/pMrW93b8=";
|
||||||
|
};
|
||||||
|
UserMerge = pkgs.fetchzip {
|
||||||
|
url = "https://extdist.wmflabs.org/dist/extensions/UserMerge-REL1_39-b10d50e.tar.gz";
|
||||||
|
sha256 = "sha256-bXhj1+OlOUJDbvEuc8iwqb1LLEu6cN6+C/7cAvnWPOQ=";
|
||||||
|
};
|
||||||
|
PluggableAuth = pkgs.fetchzip {
|
||||||
|
url = "https://extdist.wmflabs.org/dist/extensions/PluggableAuth-REL1_39-1210fc3.tar.gz";
|
||||||
|
sha256 = "sha256-F6bTMCzkK3kZwZGIsNE87WlZWqXXmTMhEjApO99YKR0=";
|
||||||
|
};
|
||||||
|
SimpleSAMLphp = pkgs.fetchzip {
|
||||||
|
url = "https://extdist.wmflabs.org/dist/extensions/SimpleSAMLphp-REL1_39-dcf0acb.tar.gz";
|
||||||
|
sha256 = "sha256-tCvFmb2+q2rxms+lRo5pgoI3h6GjCwXAR8XisPg03TQ=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
extraConfig = let
|
||||||
|
|
||||||
|
SimpleSAMLphpRepo = pkgs.stdenvNoCC.mkDerivation rec {
|
||||||
|
pname = "configuredSimpleSAML";
|
||||||
|
version = "2.0.4";
|
||||||
|
src = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/simplesamlphp/simplesamlphp/releases/download/v${version}/simplesamlphp-${version}.tar.gz";
|
||||||
|
sha256 = "sha256-pfMV/VmqqxgtG7Nx4s8MW4tWSaxOkVPtCRJwxV6RDSE=";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
cat > config/authsources.php << EOF
|
||||||
|
<?php
|
||||||
|
$config = array(
|
||||||
|
'default-sp' => array(
|
||||||
|
'saml:SP',
|
||||||
|
'idp' => 'https://idp.pvv.ntnu.no/',
|
||||||
|
),
|
||||||
|
);
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
cp -r . $out
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
in ''
|
||||||
|
$wgServer = "https://bekkalokk.pvv.ntnu.no";
|
||||||
|
$wgLocaltimezone = "Europe/Oslo";
|
||||||
|
|
||||||
|
# Only allow login through SSO
|
||||||
|
$wgEnableEmail = false;
|
||||||
|
$wgEnableUserEmail = false;
|
||||||
|
$wgEmailAuthentication = false;
|
||||||
|
$wgGroupPermissions['*']['createaccount'] = false;
|
||||||
|
$wgGroupPermissions['*']['autocreateaccount'] = true;
|
||||||
|
$wgPluggableAuth_EnableAutoLogin = true;
|
||||||
|
|
||||||
|
# Disable anonymous editing
|
||||||
|
$wgGroupPermissions['*']['edit'] = false;
|
||||||
|
|
||||||
|
# Styling
|
||||||
|
$wgLogo = "/PNG/PVV-logo.png";
|
||||||
|
$wgDefaultSkin = "monobook";
|
||||||
|
|
||||||
|
# Misc
|
||||||
|
$wgEmergencyContact = "${cfg.passwordSender}";
|
||||||
|
$wgShowIPinHeader = false;
|
||||||
|
$wgUseTeX = false;
|
||||||
|
$wgLocalInterwiki = $wgSitename;
|
||||||
|
|
||||||
|
# SimpleSAML
|
||||||
|
$wgSimpleSAMLphp_InstallDir = "${SimpleSAMLphpRepo}";
|
||||||
|
$wgSimpleSAMLphp_AuthSourceId = "default-sp";
|
||||||
|
$wgSimpleSAMLphp_RealNameAttribute = "cn";
|
||||||
|
$wgSimpleSAMLphp_EmailAttribute = "mail";
|
||||||
|
$wgSimpleSAMLphp_UsernameAttribute = "uid";
|
||||||
|
|
||||||
|
# Fix https://github.com/NixOS/nixpkgs/issues/183097
|
||||||
|
$wgDBserver = "${toString cfg.database.host}";
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Override because of https://github.com/NixOS/nixpkgs/issues/183097
|
||||||
|
systemd.services.mediawiki-init.script = let
|
||||||
|
# According to module
|
||||||
|
stateDir = "/var/lib/mediawiki";
|
||||||
|
pkg = cfg.finalPackage;
|
||||||
|
mediawikiConfig = config.services.phpfpm.pools.mediawiki.phpEnv.MEDIAWIKI_CONFIG;
|
||||||
|
inherit (lib) optionalString mkForce;
|
||||||
|
in mkForce ''
|
||||||
|
if ! test -e "${stateDir}/secret.key"; then
|
||||||
|
tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c 64 > ${stateDir}/secret.key
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "exit( wfGetDB( DB_MASTER )->tableExists( 'user' ) ? 1 : 0 );" | \
|
||||||
|
${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/eval.php --conf ${mediawikiConfig} && \
|
||||||
|
${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \
|
||||||
|
--confpath /tmp \
|
||||||
|
--scriptpath / \
|
||||||
|
--dbserver "${cfg.database.host}" \
|
||||||
|
--dbport ${toString cfg.database.port} \
|
||||||
|
--dbname ${cfg.database.name} \
|
||||||
|
${optionalString (cfg.database.tablePrefix != null) "--dbprefix ${cfg.database.tablePrefix}"} \
|
||||||
|
--dbuser ${cfg.database.user} \
|
||||||
|
${optionalString (cfg.database.passwordFile != null) "--dbpassfile ${cfg.database.passwordFile}"} \
|
||||||
|
--passfile ${cfg.passwordFile} \
|
||||||
|
--dbtype ${cfg.database.type} \
|
||||||
|
${cfg.name} \
|
||||||
|
admin
|
||||||
|
|
||||||
|
${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/update.php --conf ${mediawikiConfig} --quick
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
{ config, ... }:
|
{ pkgs, config, ... }:
|
||||||
{
|
{
|
||||||
|
security.acme = {
|
||||||
|
acceptTerms = true;
|
||||||
|
defaults.email = "drift@pvv.ntnu.no";
|
||||||
|
};
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
@ -9,20 +14,27 @@
|
||||||
recommendedGzipSettings = true;
|
recommendedGzipSettings = true;
|
||||||
|
|
||||||
virtualHosts = {
|
virtualHosts = {
|
||||||
"www.pvv.ntnu.no" = {
|
"bekkalokk.pvv.ntnu.no" = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
|
enableACME = true;
|
||||||
locations = {
|
root = "${config.services.mediawiki.finalPackage}/share/mediawiki";
|
||||||
"/pvv" = {
|
locations = {
|
||||||
proxyPass = "http://localhost:${config.services.mediawiki.virtualHost.listen.pvv.port}";
|
"/" = {
|
||||||
|
extraConfig = ''
|
||||||
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
fastcgi_pass unix:${config.services.phpfpm.pools.mediawiki.socket};
|
||||||
|
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||||
|
include ${pkgs.nginx}/conf/fastcgi.conf;
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
"git.pvv.ntnu.no" = {
|
"/images".root = config.services.mediawiki.uploadsDir;
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://unix:${config.services.gitea.settings.server.HTTP_ADDR}";
|
# "/git" = {
|
||||||
proxyWebsockets = true;
|
# proxyPass = "http://unix:${config.services.gitea.settings.server.HTTP_ADDR}";
|
||||||
|
# proxyWebsockets = true;
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,8 +5,10 @@ let
|
||||||
in rec {
|
in rec {
|
||||||
services = {
|
services = {
|
||||||
matrix = {
|
matrix = {
|
||||||
ipv4 = hosts.jokum.ipv4;
|
inherit (hosts.bicep) ipv4 ipv6;
|
||||||
ipv6 = hosts.jokum.ipv6;
|
};
|
||||||
|
postgres = {
|
||||||
|
inherit (hosts.bicep) ipv4 ipv6;
|
||||||
};
|
};
|
||||||
# Also on jokum
|
# Also on jokum
|
||||||
turn = {
|
turn = {
|
||||||
|
|
Loading…
Reference in New Issue