ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-22 05:07:45 +03:00
Code Issues Projects Releases Wiki Activity
2,290 Commits 96 Branches 102 Tags 4.5 GiB
b904954793
Commit Graph

54 Commits

Author SHA1 Message Date
Rob Vermaas
f1438d3d27 tomcat: add option to enable accesslog per virtual host (default: off) 
svn path=/nixos/trunk/; revision=20075
 2010-02-17 12:32:19 +00:00
Eelco Dolstra
83b76bc2cf * Option `services.apache.phpIni' (which is of type derivation) 
replaced by `services.apache.phpOptions' (of type string).
* Allow Apache subservices to add to phpOptions.
* Set the TZ environment variable in Apache.
* Updated the Zabbix web interface.

svn path=/nixos/trunk/; revision=20023
 2010-02-15 19:02:42 +00:00
Eelco Dolstra
07cc5ac2fd * "python2.5" -> ${pkgs.python.libPrefix} 
svn path=/nixos/trunk/; revision=19901
 2010-02-10 12:39:47 +00:00
Marc Weber
fdc63c54e4 enhance phpIni documentation 
readd r19267 (the issue should be fixed now)

Eelco Dolstra and Nicolas Pierron both kept asking me to pay attention
to the rendered manual. There is one catch: example settings such as
pkgs.kernelPackages_2_6_25 are correct however they don't render
properly. Moreover you don't want those examples to be evaluated (maybe
compiling a kernel ?) when building the manual only.
So use Strings and add a copy & paste note.
This is still a hacky. Maybe a kind of typed "verbatim" expression
should be added (?)

svn path=/nixos/trunk/; revision=19281
 2010-01-07 09:01:40 +00:00
Eelco Dolstra
ac7c404deb * Revert r19267 - it causes a corrupt Apache Upstart job to be 
generated.  E.g. in
  http://hydra.nixos.org/build/208321/nixlog/8/raw:

    webserver# init:/etc/init/httpd.conf:14: Unexpected token

svn path=/nixos/trunk/; revision=19280
 2010-01-06 23:37:30 +00:00
Marc Weber
99644df67a customizable PHPRC 
svn path=/nixos/trunk/; revision=19267
 2010-01-06 17:05:57 +00:00
Eelco Dolstra
9682f0ed90 svn path=/nixos/trunk/; revision=18872 2009-12-10 09:22:45 +00:00
Eelco Dolstra
4eabed3f0f * Support short URLs (http://server/wiki/Page instead of 
http://server/w/index.php?title=Page).

svn path=/nixos/trunk/; revision=18783
 2009-12-03 13:34:36 +00:00
Eelco Dolstra
aacd16cff0 * Make various MediaWiki scripts available in $PATH, 
e.g. mediawiki-<id>-changePassword (where <id> is usually "main").

svn path=/nixos/trunk/; revision=18780
 2009-12-03 12:20:24 +00:00
Eelco Dolstra
9f8fc09fc3 * Create a user "mediawiki" and give root and wwwrun ident-based 
access.

svn path=/nixos/trunk/; revision=18779
 2009-12-03 11:56:03 +00:00
Eelco Dolstra
c7e0a7b31c * Make it configurable. 
svn path=/nixos/trunk/; revision=18778
 2009-12-03 08:44:54 +00:00
Eelco Dolstra
81c3454cdb * Allow Mediawiki (and other PHP applications) to send email through 
the `sendmail' command (i.e. ssmtp).  This is hacky - there should
  be some global config value that specifies the path to sendmail,
  which the ssmtp module and others can then set.

svn path=/nixos/trunk/; revision=18777
 2009-12-03 08:25:16 +00:00
Eelco Dolstra
f99d9b0658 * Basic MediaWiki module. Thanks to Dario Vodopivec, Milan Seneši and 
Nasir Shadravan.

svn path=/nixos/trunk/; revision=18769
 2009-12-02 17:59:17 +00:00
Sander van der Burg
7fc40ca2f1 Enabled startOn event of the MySQL and Tomcat server so that they are initialised on startup 
svn path=/nixos/branches/upstart-0.6/; revision=18556
 2009-11-23 13:26:33 +00:00
Sander van der Burg
2c8d2c2268 Small bugfix which automatically creates tomcat configuration dirs. Otherwise the startup would fail 
svn path=/nixos/branches/upstart-0.6/; revision=18488
 2009-11-20 16:20:57 +00:00
Sander van der Burg
6d11d63ba3 Removed the nasty sleep hack of tomcat, since upstart-0,6 is also capable of only executing start and stop scripts 
svn path=/nixos/branches/upstart-0.6/; revision=18430
 2009-11-18 14:50:48 +00:00
Eelco Dolstra
d1bbe706a2 * Synced with the trunk. 
svn path=/nixos/branches/upstart-0.6/; revision=18297
 2009-11-08 21:27:53 +00:00
Eelco Dolstra
d7342c78d4 * Support pre-stop scripts. These are needed to cleanly shutdown 
daemons such as Apache or PostgreSQL.

svn path=/nixos/branches/upstart-0.6/; revision=18234
 2009-11-06 22:45:19 +00:00
Eelco Dolstra
83a9bf9a6a * Change all the startOn / stopOn attributes to the Upstart 0.6 syntax 
(e.g., startOn = "started foo" instead of startOn = "foo").

svn path=/nixos/branches/upstart-0.6/; revision=18230
 2009-11-06 22:19:17 +00:00
Nicolas Pierron
e07f1e98db * Revert 18115, 18150, 18135, 18112, 18107-18105. 
Revert modifications done on apache-httpd configurations.


svn path=/nixos/trunk/; revision=18215
 2009-11-06 16:23:25 +00:00
Nicolas Pierron
72f804c9b2 * Fix subversion test and change the name of the "config" option to 
"configuration" because it may interfered with sub-modules keywords.

svn path=/nixos/trunk/; revision=18155
 2009-11-05 19:24:02 +00:00
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