alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Create a user "mediawiki" and give root and wwwrun ident-based

Browse source 
access.

svn path=/nixos/trunk/; revision=18779
This commit is contained in:
Eelco Dolstra 2009-12-03 11:56:03 +00:00
parent c7e0a7b31c
commit 9f8fc09fc3
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/services/databases/postgresql.nix
View file

@ -63,6 +63,7 @@ in
authentication = mkOption { authentication = mkOption {
default = '' default = ''
# Generated file; do not edit! # Generated file; do not edit!
local all mediawiki ident mediawiki-users
local all all ident sameuser local all all ident sameuser
host all all 127.0.0.1/32 md5 host all all 127.0.0.1/32 md5
host all all ::1/128 md5 host all all ::1/128 md5
@ -113,6 +114,13 @@ in
environment.systemPackages = [postgresql]; environment.systemPackages = [postgresql];
# !!! This should be be in the mediawiki module, obviously.
services.postgresql.identMap =
''
mediawiki-users root mediawiki
mediawiki-users wwwrun mediawiki
'';
jobs.postgresql = jobs.postgresql =
{ description = "PostgreSQL server"; { description = "PostgreSQL server";

9
modules/services/web-servers/apache-httpd/mediawiki.nix
View file

@ -111,8 +111,7 @@ in
}; };
dbUser = mkOption { dbUser = mkOption {
default = "wwwrun"; default = "mediawiki";
example = "mediawiki";
description = "The user name for accessing the database."; description = "The user name for accessing the database.";
}; };
@ -179,7 +178,11 @@ in
if ! ${pkgs.postgresql}/bin/psql -l | grep -q ' ${config.dbName} ' ; then if ! ${pkgs.postgresql}/bin/psql -l | grep -q ' ${config.dbName} ' ; then
${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true
${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}" ${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}"
${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} "${config.dbUser}" -c "(echo 'CREATE LANGUAGE plpgsql;'; cat ${mediawikiRoot}/maintenance/postgres/tables.sql; echo 'CREATE TEXT SEARCH CONFIGURATION public.default ( COPY = pg_catalog.english );'; echo COMMIT) | ${pkgs.postgresql}/bin/psql ${config.dbName}" ( echo 'CREATE LANGUAGE plpgsql;'
cat ${mediawikiRoot}/maintenance/postgres/tables.sql
echo 'CREATE TEXT SEARCH CONFIGURATION public.default ( COPY = pg_catalog.english );'
echo COMMIT
) | ${pkgs.postgresql}/bin/psql -U "${config.dbUser}" "${config.dbName}"
fi fi
''); '');
} }