MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1975 commits 266 branches 124 tags 6.2 GiB
Commit graph

33 commits

Author SHA1 Message Date
Nicolas Pierron
7571055ad3 * Declare options for sub-services. 
* Add deprecated options for "serviceType", "serviceName", "function" and
  "config" without changing the behavior.

svn path=/nixos/trunk/; revision=18150
 2009-11-05 18:21:03 +00:00
Nicolas Pierron
1952365a51 * Remove unused subservice syntax. 
svn path=/nixos/trunk/; revision=18135
 2009-11-05 13:34:01 +00:00
Nicolas Pierron
8734b7103e * Remove needs to call getPort to access the server port. This is made 
possible by using sub-modules arguments.

svn path=/nixos/trunk/; revision=18112
 2009-11-04 18:14:42 +00:00
Nicolas Pierron
0e22df1587 * Use sub-modules for httpd virtual hosts. This add documentation entries 
and allow non-intrusive extensions of virtual hosts.

svn path=/nixos/trunk/; revision=18107
 2009-11-04 17:00:53 +00:00
Nicolas Pierron
ff1d9969fb * re-indent per-server-options.nix content. 
svn path=/nixos/trunk/; revision=18106
 2009-11-04 17:00:48 +00:00
Nicolas Pierron
063224bc84 * Convert per-server-options into a module. 
svn path=/nixos/trunk/; revision=18105
 2009-11-04 17:00:42 +00:00
Rob Vermaas
5103c7a872 list possible logformats for apache and added example 
svn path=/nixos/trunk/; revision=17929
 2009-10-22 17:37:06 +00:00
Rob Vermaas
9e80ca48cb added option to specify logformat to apache httpd, defaults to common (like it was until now) 
svn path=/nixos/trunk/; revision=17923
 2009-10-22 14:36:54 +00:00
Nicolas Pierron
24cbefd7a8 Fix example value of httpd. 
svn path=/nixos/trunk/; revision=17774
 2009-10-13 09:49:26 +00:00
Eelco Dolstra
eba8f94069 * jobAttrs -> jobs. 
svn path=/nixos/trunk/; revision=17769
 2009-10-12 18:09:34 +00:00
Eelco Dolstra
9943e0762e * Update some more modules. 
svn path=/nixos/trunk/; revision=17763
 2009-10-12 17:09:38 +00:00
Eelco Dolstra
e91d882a94 * Converted modules that were still using the old (concrete syntax) 
style of declaring Upstart jobs.  While at it, converted them to the
  current NixOS module style and improved some option descriptions.
  Hopefully I didn't break too much :-)

svn path=/nixos/trunk/; revision=17761
 2009-10-12 16:36:19 +00:00
Eelco Dolstra
e4c27acde3 * The mod_php option is no longer implemented. 
svn path=/nixos/trunk/; revision=17578
 2009-10-01 15:34:51 +00:00
Nicolas Pierron
a701637f94 Use servicePath instead of relative paths. 
svn path=/nixos/trunk/; revision=17454
 2009-09-26 23:04:43 +00:00
Sander van der Burg
f6f6bfbc2f The /var/trac directory needs to be accessible by the webserver user 
svn path=/nixos/trunk/; revision=16962
 2009-09-04 15:58:04 +00:00
Eelco Dolstra
2c5599f59b * Urgh, cleanSource doesn't work on paths in the store. Looks like a 
bug.

svn path=/nixos/trunk/; revision=16905
 2009-08-31 15:12:42 +00:00
Eelco Dolstra
9359bf11d5 * Build the Subversion test in Hydra (as a regression test for NixOS). 
* Pass the location to the services tree around instead of requiring
  it to be in ../services.

svn path=/nixos/trunk/; revision=16901
 2009-08-31 14:56:19 +00:00
Eelco Dolstra
a2945a2eb2 svn path=/nixos/trunk/; revision=16900 2009-08-31 14:26:31 +00:00
Eelco Dolstra
921b838149 * test -> tests. 
svn path=/nixos/trunk/; revision=16897
 2009-08-31 13:40:57 +00:00
Sander van der Burg
4a0be54df0 Added subversion python modules to the PYTHONPATH 
svn path=/nixos/trunk/; revision=16895
 2009-08-30 19:45:15 +00:00
Sander van der Burg
8fd9fa36c4 Added an initial Trac subservice. Trac projects still have to be created by using the trac-admin tool 
svn path=/nixos/trunk/; revision=16894
 2009-08-30 19:11:47 +00:00
Sander van der Burg
8b229a45c3 Removed the rm -rf command and replaced symlink operations by ln -sfn so that the state of tomcat can be retained \(unless somebody messes it up manually of course\) 
svn path=/nixos/trunk/; revision=16757
 2009-08-18 11:50:32 +00:00
Sander van der Burg
e8103aa39d Implemented support for per application configuration files 
svn path=/nixos/trunk/; revision=16668
 2009-08-11 09:40:31 +00:00
Sander van der Burg
ebd2fbd24f Removed mod_jk option, which is obsolete 
svn path=/nixos/trunk/; revision=16660
 2009-08-10 20:16:33 +00:00
Eelco Dolstra
f003f6d7cd * Fixed the path to the services tree. This should be a NixOS module argument. 
svn path=/nixos/trunk/; revision=16658
 2009-08-10 20:07:58 +00:00
Sander van der Burg
0d35699507 Implemented virtual host support. Now it's possible to assign web applications to virtual host, for example: 
{
  ...

  services = {
    tomcat = {
      enable = true;
      virtualHosts = [
        { name = "test1.localhost";
          webapps = [ mypkgs.HelloApp ];
        }
        { name = "test2.localhost";
          webapps = [ mypkgs.ByeApp ];
        }
      ];
    };
  };
}


svn path=/nixos/trunk/; revision=16654
 2009-08-10 18:45:18 +00:00
Sander van der Burg
89810914e4 Added virtual host support, which requires some more testing 
svn path=/nixos/trunk/; revision=16649
 2009-08-10 15:27:25 +00:00
Sander van der Burg
8c034b988d Added a lot of modifications in order to expression a Tomcat configuration better and to perform more efficient management of various Tomcat components. 
With these modifications, a user can configure a tomcat instance with web applications and web services by writing a service, such as:

...

services = {
  tomcat = {
    enable = true;
    webapps = [ mypkgs.HelloWorldWebApplication ];
    axis2 = {
      enable = true;
      services = [ mypkgs.HelloService mypkgs.HelloWorldService ];
    };
  };
};


svn path=/nixos/trunk/; revision=16619
 2009-08-09 20:19:07 +00:00
Eelco Dolstra
ca8e00cafa * Got rid of the extraPath field in jobs (use 
environment.systemPackages instead).  Also renamed
  services.extraJobs to jobs.

svn path=/nixos/branches/modular-nixos/; revision=16370
 2009-07-15 11:19:11 +00:00
Eelco Dolstra
b701207ead * Typo. 
svn path=/nixos/branches/modular-nixos/; revision=16039
 2009-06-24 22:27:54 +00:00
Eelco Dolstra
d06556e274 * Get rid of the `experimental' flag. 
svn path=/nixos/branches/modular-nixos/; revision=16010
 2009-06-19 14:27:43 +00:00
Eelco Dolstra
dba1d48b78 * Move the uid/gid mappings into a module. This allows other modules 
to use it through config.ids.{uids,gids} rather than `import
  relative-path/ids.nix'.

svn path=/nixos/branches/modular-nixos/; revision=15796
 2009-05-29 14:25:56 +00:00
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