Changeset 573
- Timestamp:
- 01/01/07 17:50:43 (2 years ago)
- Files:
-
- cherokee/trunk/ChangeLog (modified) (1 diff)
- cherokee/trunk/cherokee/main_admin.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cherokee/trunk/ChangeLog
r567 r573 1 2007-01-01 Alvaro Lopez Ortega <alvaro@alobbs.com> 2 3 * cherokee/main_admin.c (config_server): Added getopt support and 4 two parameters: port (-r) and document_root (-d). The 5 configuration has been updated as well: switched from PHP to SCGI. 6 1 7 2006-12-30 Alvaro Lopez Ortega <alvaro@alobbs.com> 2 8 cherokee/trunk/cherokee/main_admin.c
r384 r573 25 25 #include "common-internal.h" 26 26 27 #ifdef HAVE_GETOPT_H 28 # include <getopt.h> 29 #endif 30 27 31 #include "virtual_server.h" 28 32 #include "server-protected.h" 29 33 #include "config_entry.h" 30 34 35 #define GETOPT_OPT "d:p:" 36 #define CONFIG_FILE_HELP "[-r DIR] [-p PORT]" 37 31 38 #define DEFAULT_PORT 9090 32 39 #define DEFAULT_DOCUMENTROOT CHEROKEE_DATADIR "/admin/" 40 41 static int port = DEFAULT_PORT; 42 static char *document_root = DEFAULT_DOCUMENTROOT; 33 43 34 44 … … 39 49 cherokee_buffer_t buf = CHEROKEE_BUF_INIT; 40 50 41 cherokee_buffer_add_va (&buf, "server!port = %d\n", DEFAULT_PORT);51 cherokee_buffer_add_va (&buf, "server!port = %d\n", port); 42 52 cherokee_buffer_add_str (&buf, "server!ipv6 = 0\n"); 43 53 cherokee_buffer_add_str (&buf, "server!listen = 127.0.0.1\n"); 44 54 cherokee_buffer_add_str (&buf, "server!max_connection_reuse = 0\n"); 45 55 46 cherokee_buffer_add_va (&buf, "vserver!default!document_root = %s\n", DEFAULT_DOCUMENTROOT); 47 cherokee_buffer_add_str (&buf, "vserver!default!directory_index = index.php\n"); 48 cherokee_buffer_add_str (&buf, "vserver!default!directory!/!handler = common\n"); 49 cherokee_buffer_add_str (&buf, "vserver!default!directory!/!priority = 1\n"); 56 cherokee_buffer_add_va (&buf, "vserver!default!document_root = %s\n", document_root); 50 57 51 58 cherokee_buffer_add_str (&buf, "vserver!default!directory!/about!handler = server_info\n"); 52 59 cherokee_buffer_add_str (&buf, "vserver!default!directory!/about!priority = 2\n"); 53 60 54 cherokee_buffer_add_str (&buf, "vserver!default!extensions!php!handler = phpcgi\n"); 55 cherokee_buffer_add_str (&buf, "vserver!default!extensions!php!priority = 3\n"); 61 cherokee_buffer_add_str (&buf, "vserver!default!directory!/theme!handler = file\n"); 62 cherokee_buffer_add_str (&buf, "vserver!default!directory!/theme!priority = 3\n"); 63 64 cherokee_buffer_add_str (&buf, "vserver!default!directory!/yui!handler = file\n"); 65 cherokee_buffer_add_str (&buf, "vserver!default!directory!/yui!priority = 4\n"); 66 67 cherokee_buffer_add_str (&buf, "vserver!default!directory!/!handler = scgi\n"); 68 cherokee_buffer_add_str (&buf, "vserver!default!directory!/!handler!balancer = round_robin\n"); 69 cherokee_buffer_add_str (&buf, "vserver!default!directory!/!handler!balancer!type = interpreter\n"); 70 cherokee_buffer_add_str (&buf, "vserver!default!directory!/!handler!balancer!local1!host = localhost:4000\n"); 71 cherokee_buffer_add_str (&buf, "vserver!default!directory!/!priority = 1000\n"); 72 73 printf ("%s", buf.buf); 56 74 57 75 ret = cherokee_server_read_config_string (srv, &buf); … … 63 81 64 82 83 static void 84 process_parameters (int argc, char **argv) 85 { 86 int c; 87 88 while ((c = getopt(argc, argv, GETOPT_OPT)) != -1) { 89 switch(c) { 90 case 'p': 91 port = atoi(optarg); 92 break; 93 case 'd': 94 document_root = strdup(optarg); 95 break; 96 default: 97 fprintf (stderr, "Usage: %s " CONFIG_FILE_HELP "\n", argv[0]); 98 exit(1); 99 } 100 } 101 } 102 103 65 104 int 66 105 main (int argc, char **argv) … … 68 107 ret_t ret; 69 108 cherokee_server_t *srv; 109 110 process_parameters (argc, argv); 70 111 71 112 ret = cherokee_server_new (&srv);