diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-26 13:06:43 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-26 13:06:43 +0200 |
| commit | 7077a270bf625b320ab61e3951aa19c9d514b5dc (patch) | |
| tree | 42660271ea34c60368a6e3393ac5eedb65fe4a78 /nixos/modules/services/web-servers | |
| parent | fea23020fef87f20fe81477d33eb9b8ca72e7f2e (diff) | |
| parent | 2273849a85e49d3a1fe55d11110cebb3377dddf6 (diff) | |
| download | nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.gz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.bz2 nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.lz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.xz nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.tar.zst nixlib-7077a270bf625b320ab61e3951aa19c9d514b5dc.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'nixos/modules/services/web-servers')
3 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 4f9e9f52f9e0..1ed489bcb095 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -288,6 +288,7 @@ in }; extraConfig = mkOption { + type = types.lines; default = ""; example = '' diff --git a/nixos/modules/services/web-servers/apache-httpd/moodle.nix b/nixos/modules/services/web-servers/apache-httpd/moodle.nix index aa00e89967db..d525348d5c7e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/moodle.nix +++ b/nixos/modules/services/web-servers/apache-httpd/moodle.nix @@ -164,6 +164,7 @@ in extraConfig = mkOption { + type = types.lines; default = ""; example = '' diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index 2315c4729aec..32dd4439675a 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -212,6 +212,7 @@ in example = "[ \"en_GB\" \"de_DE\" ];"; }; extraConfig = mkOption { + type = types.lines; default = ""; example = '' |