Changeset 974

Show
Ignore:
Timestamp:
01/03/08 10:46:34 (11 months ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r969 r974  
     12008-01-03  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * admin, admin/advanced.help.html, admin/config.py, 
     4        admin/default.template.html, admin/entry.help.html, 
     5        admin/Entry.py, admin/Form.py, admin/general.help.html, 
     6        admin/icon.help.html, admin/main.help.html, 
     7        admin/main.template.html, admin/Makefile.am, admin/mime.help.html, 
     8        admin/Page.py, admin/PageAdvanced.py, admin/PageApply.py, 
     9        admin/PageEntry.py, admin/PageGeneral.py, admin/PageIcon.py, 
     10        admin/PageMain.py, admin/PageMime.py, admin/PageVServer.py, 
     11        admin/PageVServers.py, admin/pyscgi.py, admin/server.py, 
     12        admin/Table.py, admin/Theme.py, admin/validations.py, 
     13        admin/VirtualServer.py, admin/vserver.help.html, 
     14        admin/vservers.help.html, configure.in, Makefile.am: Merge of the 
     15        new adminitration interface (early beta state). 
     16 
     17        * cherokee/main_admin.c: Added new parameter -C. It allow to 
     18        specify the configuration file that should be edited. 
     19 
    1202007-12-31  A.D.F  <adefacc@tin.it> 
    221 

  • cherokee/trunk/Makefile.am

    r805 r974  
    11## Cherokee: Makefile.am  -*- makefile -*- 
    22 
    3 SUBDIRS = m4 contrib www icons doc themes qa cherokee cget windows 
     3SUBDIRS = m4 contrib www icons doc themes qa cherokee cget windows admin 
    44bin_SCRIPTS = cherokee-config 
    55SUFFIXES = .sample.pre .sample 

  • cherokee/trunk/cherokee/main_admin.c

    r941 r974  
    3333#include "config_entry.h" 
    3434 
    35 #define GETOPT_OPT           "d:p:a" 
    36 #define CONFIG_FILE_HELP     "[-d DIR] [-p PORT] [-a]" 
     35#define GETOPT_OPT           "d:p:aC:" 
     36#define CONFIG_FILE_HELP     "[-d DIR] [-p PORT] [-C FILE] [-a]" 
    3737 
    3838#define DEFAULT_PORT         9090 
    39 #define DEFAULT_DOCUMENTROOT CHEROKEE_DATADIR "/admin/" 
    40  
     39#define DEFAULT_DOCUMENTROOT CHEROKEE_DATADIR "/admin" 
     40#define DEFAULT_CONFIG_FILE  CHEROKEE_CONFDIR "/cherokee.conf" 
     41  
    4142static int                 port          = DEFAULT_PORT; 
    4243static char               *document_root = DEFAULT_DOCUMENTROOT; 
     44static char               *config_file   = DEFAULT_CONFIG_FILE; 
    4345static cherokee_boolean_t  bind_local    = true; 
    4446 
    …… 
    6264        cherokee_buffer_add_str (&buf, "vserver!default!directory!/about!priority = 2\n"); 
    6365 
    64         cherokee_buffer_add_str (&buf, "vserver!default!directory!/theme!handler = file\n"); 
    65         cherokee_buffer_add_str (&buf, "vserver!default!directory!/theme!handler!iocache = 0\n"); 
    66         cherokee_buffer_add_str (&buf, "vserver!default!directory!/theme!priority = 3\n"); 
    67  
    68         cherokee_buffer_add_str (&buf, "vserver!default!directory!/yui!handler = file\n"); 
    69         cherokee_buffer_add_str (&buf, "vserver!default!directory!/yui!handler!iocache = 0\n"); 
    70         cherokee_buffer_add_str (&buf, "vserver!default!directory!/yui!priority = 4\n"); 
     66        cherokee_buffer_add_str (&buf, "vserver!default!directory!/static!handler = file\n"); 
     67        cherokee_buffer_add_str (&buf, "vserver!default!directory!/static!handler!iocache = 0\n"); 
     68        cherokee_buffer_add_str (&buf, "vserver!default!directory!/static!priority = 3\n"); 
    7169 
    7270        cherokee_buffer_add_str (&buf, "vserver!default!directory!/!handler = scgi\n"); 
    …… 
    7472        cherokee_buffer_add_str (&buf, "vserver!default!directory!/!handler!balancer!type = interpreter\n"); 
    7573        cherokee_buffer_add_str (&buf, "vserver!default!directory!/!handler!balancer!local1!host = localhost:4000\n"); 
    76         cherokee_buffer_add_va  (&buf, "vserver!default!directory!/!handler!balancer!local1!interpreter = %s/server.sh\n", document_root); 
     74        cherokee_buffer_add_va  (&buf, "vserver!default!directory!/!handler!balancer!local1!interpreter = python %s/server.py %s\n", document_root, config_file); 
    7775        cherokee_buffer_add_str (&buf, "vserver!default!directory!/!priority = 1000\n"); 
    7876 
    …… 
    10098                case 'd': 
    10199                        document_root = strdup(optarg); 
     100                        break; 
     101                case 'C': 
     102                        config_file = strdup(optarg); 
    102103                        break; 
    103104                default: 

  • cherokee/trunk/configure.in

    r947 r974  
    11541154windows/cherokee.nsi 
    11551155www/Makefile  
     1156admin/Makefile 
    11561157]) 
    11571158