public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tt-rss service: #15862 has been merged; enable nginx virtualhost config

Browse Source
This commit is contained in:
Nadrieril 2016-08-27 12:20:28 -07:00
parent 33d6371fd9
commit 789a37f0fc
No known key found for this signature in database
GPG Key ID: 9147A2CAED830DC5
1 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
nixos/modules/services/web-apps/tt-rss.nix
View File

@ -18,7 +18,6 @@ let
poolName = "tt-rss"; poolName = "tt-rss";
phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock";
virtualHostName = "tt-rss";
tt-rss-config = pkgs.writeText "config.php" '' tt-rss-config = pkgs.writeText "config.php" ''
<?php <?php
@ -119,17 +118,13 @@ let
''; '';
}; };
# TODO: Re-enable after https://github.com/NixOS/nixpkgs/pull/15862 is merged virtualHost = mkOption {
type = types.nullOr types.str;
# virtualHost = mkOption { default = "tt-rss";
# type = types.str; description = ''
# default = "${virtualHostName}"; Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost.
# description = '' '';
# Name of existing nginx virtual host that is used to run web-application. };
# If not specified a host will be created automatically with
# default values.
# '';
# };
database = { database = {
type = mkOption { type = mkOption {
@ -456,7 +451,7 @@ let
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.phpfpm.poolConfigs = if cfg.pool == "${poolName}" then { services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") {
"${poolName}" = '' "${poolName}" = ''
listen = "${phpfpmSocketName}"; listen = "${phpfpmSocketName}";
listen.owner = nginx listen.owner = nginx
@ -471,36 +466,26 @@ let
pm.max_requests = 500 pm.max_requests = 500
catch_workers_output = 1 catch_workers_output = 1
''; '';
} else {}; };
# TODO: Re-enable after https://github.com/NixOS/nixpkgs/pull/15862 is merged services.nginx.virtualHosts = mkIf (cfg.virtualHost != null) {
"${cfg.virtualHost}" = {
root = "${cfg.root}";
# services.nginx.virtualHosts = if cfg.virtualHost == "${virtualHostName}" then { locations."/" = {
# "${virtualHostName}" = { index = "index.php";
# root = "${root}"; };
# extraConfig = ''
# access_log /var/log/nginx-${virtualHostName}-access.log;
# error_log /var/log/nginx-${virtualHostName}-error.log;
# '';
# locations."/" = { locations."~ \.php$" = {
# extraConfig = '' extraConfig = ''
# index index.php; fastcgi_split_path_info ^(.+\.php)(/.+)$;
# ''; fastcgi_pass unix:${phpfpmSocketName};
# }; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME ${cfg.root}/$fastcgi_script_name;
# locations."~ \.php$" = { '';
# extraConfig = '' };
# fastcgi_split_path_info ^(.+\.php)(/.+)$; };
# fastcgi_pass unix:${phpfpmSocketName}; };
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME ${root}/$fastcgi_script_name;
# include ${pkgs.nginx}/conf/fastcgi_params;
# '';
# };
# };
# } else {};
systemd.services.tt-rss = let systemd.services.tt-rss = let