BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1444 commits 1 branch 0 tags 3.8 GiB
Commit graph

31 commits

Author SHA1 Message Date
Eelco Dolstra
5ebdee3577 * Continued refactoring the tree: moved most Upstart jobs (namely 
those that run daemons) to modules/services.  This probably broke
  some things since there are a few relative paths in modules
  (e.g. imports of system/ids.nix).
* Moved some PAM modules out of etc/pam.d to the directories of NixOS
  modules that use them.

svn path=/nixos/branches/modular-nixos/; revision=15717
 2009-05-24 23:13:23 +00:00
Eelco Dolstra
3f03fbe278 * lib.getAttr renamed. 
svn path=/nixos/branches/modular-nixos/; revision=15700
 2009-05-24 18:28:30 +00:00
Marc Weber
e7b7d62777 Convert "httpd" and "apache-httpd" 
svn path=/nixos/branches/fix-style/; revision=14382
 2009-03-06 12:26:41 +00:00
Marc Weber
77d1d30e97 doh, removed debug statement and superfluous wrong character 
svn path=/nixos/trunk/; revision=12862
 2008-09-14 13:29:09 +00:00
Marc Weber
ca031ce720 httpd.extraModules: now accpets string items loading modules beeing distributed by apache 
removed pkgs : arg

svn path=/nixos/trunk/; revision=12861
 2008-09-14 01:30:45 +00:00
Eelco Dolstra
a49eb4d1f9 * extraSubservices: renamed serviceName' to serviceType' which is more 
correct.

svn path=/nixos/trunk/; revision=12026
 2008-06-09 16:41:41 +00:00
Eelco Dolstra
5235acb1d7 * extraSubservices: the subservice config no longer needs to be 
in a `config' attribute.  So instead of

    extraSubservices = [
      { serviceName = "foo";
        config = {
          bla = ...;
        };
      }
    ];

  you can write

    extraSubservices = [
      { serviceName = "foo";
        bla = ...;
      }
    ];

svn path=/nixos/trunk/; revision=12024
 2008-06-09 16:35:24 +00:00
Eelco Dolstra
deaf99ca92 * Added a subservices for the Zabbix PHP frontend. 
* Apache subservices: missing declarations are filled in with defaults.

svn path=/nixos/trunk/; revision=12022
 2008-06-09 15:52:02 +00:00
Marc Weber
7a7582ec01 * added extraModules apache configuration option 
Eelco, can your review this patch ?
I hope it fits your design - if not revert it
This way we can drop the mod_php option (See example)

svn path=/nixos/trunk/; revision=11734
 2008-04-27 23:56:51 +00:00
Michael Raskin
7ee619f83d Typo fix & NameVirtualHost generation 
svn path=/nixos/trunk/; revision=11710
 2008-04-24 18:32:05 +00:00
Eelco Dolstra
5dbe45bfea * Modified the SSL configuration a bit. Instead of having a httpPort 
and a httpsPort, there are now options "port" and "enableSSL".  So
  to get https you should typically set up a vhost like this:

    virtualHosts = [
      { hostName = "foo.example.org";
        enableSSL = true;
        sslServerCert = "...";
        sslServerKey = "...";
      }
    ];

* sslServerCert and sslServerKey can be set per vhost.  This is
  currently only useful when doing IP-based vhosting.

* enableUserDir is now a per-vhost setting, as it should be.

* Convenience option globalRedirect to redirect the entire host to
  some URL.

svn path=/nixos/trunk/; revision=11704
 2008-04-24 11:56:38 +00:00
Michael Raskin
8fd2404adf Lots of fixes to Apache HTTPD configuration. Net result: I can have SSL-only SVN repository on :12443 and SSL-enabled http server with userDirs. 
svn path=/nixos/trunk/; revision=11660
 2008-04-19 10:21:42 +00:00
Michael Raskin
02decddeb1 Added possibility to use names instead of full paths in httpd subservices. Yes, the same dirty hack again 
svn path=/nixos/trunk/; revision=11615
 2008-04-13 09:35:18 +00:00
Michael Raskin
5e1ee10f3c HTTPS support in httpd upstart job fixed. 
svn path=/nixos/trunk/; revision=11613
 2008-04-12 20:08:35 +00:00
Eelco Dolstra
50800ad3b5 svn path=/nixos/trunk/; revision=10781 2008-02-20 13:29:08 +00:00
Eelco Dolstra
8b165fc1f4 * Allow subservices to declare a script that will be run before 
the server start.  Useful to initialise necessary state.

svn path=/nixos/trunk/; revision=10761
 2008-02-19 17:37:05 +00:00
Eelco Dolstra
a2c20a9d29 * Virtual hosts: inherit adminAddr from the main server. 
svn path=/nixos/trunk/; revision=10756
 2008-02-19 14:54:19 +00:00
Eelco Dolstra
d7dd9179ce * Allow aliases for each virtual host. 
svn path=/nixos/trunk/; revision=10754
 2008-02-19 14:41:20 +00:00
Eelco Dolstra
bbbef0f2fa * extraDirectores -> extraConfig. 
svn path=/nixos/trunk/; revision=10731
 2008-02-18 15:00:26 +00:00
Eelco Dolstra
b9d01830d3 * In a vhost, merge in the robots.txt for the main server. 
svn path=/nixos/trunk/; revision=10688
 2008-02-14 14:14:39 +00:00
Eelco Dolstra
44fceb9c4d svn path=/nixos/trunk/; revision=10686 2008-02-14 13:37:09 +00:00
Eelco Dolstra
94937ba2aa * Support for declaring virtual hosts, like 
httpd = {
      ...
      virtualHosts = [
        { hostName = "foo";
          documentRoot = "/data/webroot-foo";
          ...
        }
        { hostName = "bar";
          documentRoot = "/data/webroot-bar";
          ...
        }
      ];
    };

  Each virtual host can specify almost any option also permitted in
  the top-level httpd configuration.

svn path=/nixos/trunk/; revision=10682
 2008-02-14 13:20:26 +00:00
Eelco Dolstra
f6fce91cb2 * Allow httpd subservices to declare options locally. 
* Allow multiple instantiations of a subservice (for instance,
  multiple Subversion subservices in the same Apache server).

svn path=/nixos/trunk/; revision=10675
 2008-02-14 09:54:25 +00:00
Eelco Dolstra
18123c08ca * Refactoring. 
svn path=/nixos/trunk/; revision=10671
 2008-02-14 07:42:52 +00:00
Eelco Dolstra
6e06b11097 svn path=/nixos/trunk/; revision=10643 2008-02-12 12:56:39 +00:00
Eelco Dolstra
eca9242918 svn path=/nixos/trunk/; revision=10624 2008-02-11 11:51:51 +00:00
Eelco Dolstra
8bf1cade68 * New-style Subversion server configuration. 
svn path=/nixos/trunk/; revision=10508
 2008-02-05 16:25:07 +00:00
Eelco Dolstra
3da504ab6a * Disable mod_unique_id because it fails when the machine doesn't have 
an IP address yet.
* Create /var/run/httpd, /var/log/httpd automatically.

svn path=/nixos/trunk/; revision=10064
 2008-01-03 17:11:36 +00:00
Michael Raskin
b3fa4f1e4e Added some xfs and general font changes. 
svn path=/nixos/trunk/; revision=9966
 2007-12-25 12:16:38 +00:00
Eelco Dolstra
4ef15fc095 * Statically check whether the generated httpd.conf is correct. 
* Option `noUserDir' -> `enableUserDir', negatives are bad :-)

svn path=/nixos/trunk/; revision=9927
 2007-12-12 15:30:17 +00:00
Eelco Dolstra
6f5da72337 * Start of a nicer Apache configuration than the old stuff in the 
services tree.  This one does the generation of httpd.conf in
  the Nix expression language instead of in a builder.

svn path=/nixos/trunk/; revision=9926
 2007-12-12 13:58:15 +00:00