Changeset 591

Show
Ignore:
Timestamp:
01/07/07 14:23:33 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r590 r591  
     12007-01-07  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * qa/139-domain-wildcards1.py: Added new QA test to test wildcard 
     4        domain names. 
     5 
     6        * qa/020-VirtualHost.py, qa/021-VirtualHost2.py, qa/044-Home.py, 
     7        qa/045-Home2.py, qa/066-DirectoryIndex3.py, qa/094-URL-request.py, 
     8        qa/116-RequestTiny.py, qa/117-DomainToDir.py, qa/121-NoUserDir.py, 
     9        qa/124-DomainToDir2.py, qa/125-domain-redir1.py, 
     10        qa/135-RedirParams.py: Examples modified to work with the little 
     11        syntax modification that this change set introduces. I've also 
     12        done some clean up (there were way too many '%s') 
     13         
     14        * cherokee/virtual_server.c: Added new domains property. It's a 
     15        new virtual server names class object (a list in which it stores 
     16        its domain names). 
     17 
     18        The domain name configuration has been moved to this class. 
     19        Previously we were configuring it inside the server.c file, right 
     20        before adding the virtual server to the old virtual server table. 
     21        Now, all that stuff has changed. There is no such table, and the 
     22        configuration is performed in the right place. 
     23 
     24        * cherokee/server.c: All the virtual server related code has been 
     25        modified to work with the last improvements: TLS detection, 
     26        instance, configuration, log flushing, and free. 
     27 
     28        A new method, names cherokee_server_get_vserver() has been added 
     29        as well. 
     30         
     31        * cherokee/connection.c: Modified to work with the latest changes 
     32        related to virtual server names. 
     33 
     34        * cherokee/virtual_server_names.h, 
     35        cherokee/virtual_server_names.c: New class. It handles the virtual 
     36        server domain names. 
     37         
    1382007-01-05  A.D.F  <adefacc@tin.it> 
    239 

  • cherokee/trunk/cherokee/Makefile.am

    r587 r591  
    849849server.h \ 
    850850server.c \ 
    851 virtual_server_list.h \ 
    852 virtual_server_list.c \ 
     851virtual_server_names.h \ 
     852virtual_server_names.c \ 
    853853virtual_server.h \ 
    854854virtual_server.c \ 

  • cherokee/trunk/cherokee/connection.c

    r590 r591  
    14441444                if (unlikely(ret < ret_ok)) goto error; 
    14451445                 
    1446                 /* Set the virtual host reference 
     1446                /* Set the virtual server reference 
    14471447                 */ 
    1448                 cherokee_table_get (&CONN_SRV(conn)->vservers_ref, conn->host.buf, &conn->vserver); 
     1448                cherokee_server_get_vserver (CONN_SRV(conn), &conn->host, &conn->vserver); 
    14491449                break; 
    14501450 

  • cherokee/trunk/cherokee/server-protected.h

    r587 r591  
    5757#include "config_node.h" 
    5858#include "version.h" 
    59 #include "list_wildcards.h" 
    6059 
    6160 
    …… 
    7877        /* Virtual servers 
    7978         */ 
    80 //      cherokee_list_t            vservers; 
    81 //      cherokee_table_t           vservers_ref; 
    82         cherokee_list_wildcards_t *vservers; 
    83         cherokee_list_t            vservers_list; 
     79        cherokee_list_t            vservers; 
    8480        cherokee_virtual_server_t *vserver_default; 
    8581         
    …… 
    190186 
    191187ret_t cherokee_server_del_connection (cherokee_server_t *srv, char *begin); 
     188ret_t cherokee_server_get_vserver    (cherokee_server_t *srv, cherokee_buffer_t *name, cherokee_virtual_server_t **vsrv); 
    192189 
    193190#endif /* CHEROKEE_SERVER_PROTECTED_H */ 

  • cherokee/trunk/cherokee/server.c

    r587 r591  
    210210        cherokee_plugin_loader_init (&n->loader); 
    211211 
    212         /* Virtual servers table 
     212        /* Virtual servers list 
    213213         */ 
    214214        INIT_LIST_HEAD (&n->vservers); 
    215         INIT_LIST_HEAD (&n->vservers_list); 
    216  
    217 //      cherokee_table_init (&n->vservers_ref); 
    218215 
    219216        cherokee_virtual_server_new (&n->vserver_default, n); 
    …… 
    279276        cherokee_list_t *i, *j; 
    280277 
    281         list_for_each_safe (i, j, &srv->vservers_list) { 
     278        list_for_each_safe (i, j, &srv->vservers) { 
    282279                cherokee_virtual_server_free (VSERVER(i)); 
    283280        } 
    284  
    285          
    286         cherokee_list_wildcards_clean (&srv->vservers, cherokee_virtual_server_free); 
    287 //      cherokee_table_mrproper (&srv->vservers_ref); 
    288281} 
    289282 
    …… 
    785778 
    786779 
    787 static void 
    788 vserver_init_tls (cherokee_virtual_server_t *vserver) 
    789 { 
    790         ret_t ret; 
    791         = VSERVER(value); 
    792  
    793         ret = cherokee_virtual_server_init_tls (vserver); 
    794         if (ret < ret_ok) { 
    795                 PRINT_ERROR ("Can not initialize TLS for `%s' virtual host\n",  
    796                              cherokee_buffer_is_empty(&vserver->name) ? "unknown" : vserver->name.buf); 
    797         } 
    798 } 
    799  
    800  
    801 static int   
    802 while_vserver_check_tls_func (const char *key, void *value, void *param) 
    803 { 
    804         ret_t ret; 
    805          
    806         ret = cherokee_virtual_server_have_tls (VSERVER(value)); 
    807         return (ret == ret_ok) ? 1 : 0; 
     780static ret_t 
     781check_vservers_tls (cherokee_server_t *srv) 
     782{ 
     783        ret_t            ret; 
     784        cherokee_list_t *i; 
     785 
     786        list_for_each (i, &srv->vservers) { 
     787               ret = cherokee_virtual_server_has_tls (VSERVER(i)); 
     788                if (ret == ret_ok) { 
     789                        TRACE (ENTRIES, "Virtual Server %s: TLS enabled\n", VSERVER(i)->name.buf); 
     790                       return ret_ok; 
     791               } 
     792        } 
     793         
     794        ret = cherokee_virtual_server_has_tls (srv->vserver_default); 
     795        if (ret == ret_ok) { 
     796                TRACE (ENTRIES, "Virtual Server %s: TLS enabled\n", "default"); 
     797               return ret_ok; 
     798        } 
     799 
     800        return ret_not_found; 
    808801} 
    809802 
    …… 
    813806{ 
    814807#ifdef HAVE_TLS 
    815         ret_t   ret; 
    816         list_t *i; 
     808        ret_t            ret; 
     809        cherokee_list_t *i; 
    817810 
    818811        /* Initialize the server TLS socket 
    …… 
    832825 
    833826        list_for_each (i, &srv->vservers) { 
    834                 vserver_init_tls (LIST_WILDCARDS_ENTRY(i)->value); 
    835         } 
    836 //      cherokee_table_foreach (&srv->vservers_ref, for_each_vserver_init_tls_func); 
     827                cherokee_virtual_server_t *vserver = VSERVER(i); 
     828 
     829                ret = cherokee_virtual_server_init_tls (vserver); 
     830                if (ret < ret_ok) { 
     831                        PRINT_ERROR ("Can not initialize TLS for `%s' virtual host\n",  
     832                                     cherokee_buffer_is_empty(&vserver->name) ? "unknown" : vserver->name.buf); 
     833                } 
     834        } 
    837835#endif 
    838836 
    …… 
    921919        } 
    922920 
    923         /* Look if TLS is enabled 
    924          */ 
    925         ret = cherokee_virtual_server_have_tls (srv->vserver_default); 
    926         srv->tls_enabled = (ret == ret_ok); 
    927  
    928         if (srv->tls_enabled == false) { 
    929                 list_t                    *i; 
    930                 cherokee_virtual_server_t *vsrv; 
    931  
    932                 list_for_each (i, &srv->vservers) { 
    933                         vsrv = LIST_WILDCARDS_ENTRY(i)->value; 
    934  
    935                         ret = cherokee_virtual_server_have_tls (vsrv); 
    936                         if (ret == ret_ok)  
    937                                 srv->tls_enabled = true; 
    938                 } 
    939 //              ret = cherokee_table_while (&srv->vservers_ref, while_vserver_check_tls_func, NULL, NULL, NULL); 
    940 //              srv->tls_enabled = (ret == ret_ok); 
    941         } 
     921        /* Init the SSL/TLS support 
     922         */ 
     923        srv->tls_enabled = (check_vservers_tls (srv) == ret_ok); 
    942924 
    943925        if (srv->tls_enabled) { 
    944926                ret = init_vservers_tls (srv); 
    945                 if (unlikely(ret != ret_ok)) return ret; 
     927                if (ret != ret_ok) return ret; 
    946928        } 
    947929 
    …… 
    1017999 
    10181000 
    1019 /* static void */ 
    1020 /* flush_vserver (const char *key, void *value) */ 
    1021 /* { */ 
    1022 /*      /\* There's no logger in this virtual server */ 
    1023 /*       *\/ */ 
    1024 /*      if ((value == NULL) || (VSERVER_LOGGER(value) == NULL)) */ 
    1025 /*              return; */ 
    1026  
    1027 /*      cherokee_logger_flush (VSERVER_LOGGER(value)); */ 
    1028 /* } */ 
    1029  
    1030  
    10311001static void 
    10321002flush_logs (cherokee_server_t *srv) 
    10331003{ 
    1034         list_t                    *i; 
    1035         cherokee_virtual_server_t *vsrv; 
    1036  
    1037         flush_vserver (NULL, srv->vserver_default); 
    1038 //      cherokee_table_foreach (&srv->vservers_ref, flush_vserver); 
     1004        cherokee_list_t   *i; 
     1005        cherokee_logger_t *logger; 
    10391006 
    10401007        list_for_each (i, &srv->vservers) { 
    1041                 vsrv = LIST_WILDCARDS_ENTRY(i)->value; 
    1042  
    1043                 if (VSERVER_LOGGER(vsrv)) { 
    1044                         cherokee_logger_flush (VSERVER_LOGGER(vsrv)); 
    1045                 } 
    1046         } 
     1008                logger = VSERVER_LOGGER(i); 
     1009 
     1010                if (logger) 
     1011                        cherokee_logger_flush (VSERVER_LOGGER(i)); 
     1012        } 
     1013 
     1014        logger = VSERVER_LOGGER(srv->vserver_default); 
     1015        if (logger)  
     1016                cherokee_logger_flush (VSERVER_LOGGER(srv->vserver_default)); 
    10471017} 
    10481018 
    …… 
    11991169} 
    12001170 
    1201  
    1202 static ret_t  
    1203 add_vserver_alias (char *alias, void *data) 
    1204 { 
    1205         cherokee_server_t         *srv  = ((void **)data)[0]; 
    1206         cherokee_virtual_server_t *vsrv = ((void **)data)[1]; 
    1207  
    1208         TRACE (ENTRIES, "Adding vserver alias '%s'\n", alias);   
    1209         return cherokee_table_add (&srv->vservers_ref, alias, vsrv); 
    1210 } 
    1211  
    1212  
    12131171static ret_t  
    12141172matching_list_add_allow_cb  (char *val, void *data) 
    …… 
    12861244 
    12871245static ret_t  
    1288 add_vserver (cherokee_config_node_t *node, void *data) 
     1246add_vserver (cherokee_config_node_t *conf, void *data) 
    12891247{ 
    12901248        ret_t                      ret; 
    12911249        cherokee_virtual_server_t *vsrv; 
    1292         void                      *param[2]; 
    12931250        cherokee_server_t         *srv = SRV(data); 
    12941251 
    1295         TRACE (ENTRIES, "Adding vserver %s\n", node->key.buf); 
    1296  
    1297         if (equal_buf_str (&node->key, "default")) { 
     1252        TRACE (ENTRIES, "Adding vserver %s\n", conf->key.buf); 
     1253 
     1254        if (equal_buf_str (&conf->key, "default")) { 
    12981255                vsrv = srv->vserver_default; 
     1256 
    12991257        } else { 
    1300                 /* Add alias    
     1258                /* Create a new vserver and enqueue it 
    13011259                 */ 
    13021260                ret = cherokee_virtual_server_new (&vsrv, srv); 
    13031261                if (ret != ret_ok) return ret; 
    13041262 
    1305                 ret = cherokee_table_add (&srv->vservers_ref, node->key.buf, vsrv); 
    1306                 if (ret != ret_ok) return ret; 
    1307  
    1308                 cherokee_list_add (LIST(vsrv), &srv->vservers_list); 
    1309  
    1310                 param[0] = srv; 
    1311                 param[1] = vsrv; 
    1312                 cherokee_config_node_read_list (node, "alias", add_vserver_alias, param); 
    1313         } 
    1314  
    1315         ret = cherokee_virtual_server_configure (vsrv, &node->key, node); 
     1263                cherokee_list_add (LIST(vsrv), &srv->vservers); 
     1264        } 
     1265 
     1266        ret = cherokee_virtual_server_configure (vsrv, &conf->key, conf); 
    13161267        if (ret != ret_ok) return ret;   
    13171268 
    …… 
    18431794} 
    18441795 
     1796 
     1797ret_t  
     1798cherokee_server_get_vserver (cherokee_server_t *srv, cherokee_buffer_t *name, cherokee_virtual_server_t **vsrv) 
     1799{ 
     1800        ret_t                      ret; 
     1801        cherokee_list_t           *i; 
     1802        cherokee_virtual_server_t *vserver; 
     1803 
     1804        list_for_each (i, &srv->vservers) { 
     1805                vserver = VSERVER(i); 
     1806 
     1807                ret = cherokee_vserver_names_find (&vserver->domains, name); 
     1808                if (ret == ret_ok) { 
     1809                        *vsrv = vserver; 
     1810                        return ret_ok; 
     1811                } 
     1812        } 
     1813 
     1814        *vsrv = srv->vserver_default; 
     1815        return ret_ok; 
     1816} 

  • cherokee/trunk/cherokee/virtual_server.c

    r567 r591  
    9393        if (unlikely(ret < ret_ok)) return ret; 
    9494 
     95        INIT_LIST_HEAD (&n->domains); 
     96 
    9597        ret = cherokee_buffer_init (&n->userdir); 
    9698        if (unlikely(ret < ret_ok)) return ret; 
    …… 
    138140 
    139141        cherokee_buffer_mrproper (&vserver->name); 
     142        cherokee_vserver_names_mrproper (&vserver->domains); 
     143 
    140144        cherokee_buffer_mrproper (&vserver->root); 
    141145 
    …… 
    194198 
    195199ret_t  
    196 cherokee_virtual_server_have_tls (cherokee_virtual_server_t *vserver) 
     200cherokee_virtual_server_has_tls (cherokee_virtual_server_t *vserver) 
    197201{ 
    198202#ifndef HAVE_TLS 
    …… 
    610614 
    611615static ret_t  
     616add_domain (cherokee_config_node_t *config, cherokee_virtual_server_t *vserver) 
     617{ 
     618        ret_t ret; 
     619 
     620        TRACE (ENTRIES, "Adding vserver '%s' domain name '%s'\n", vserver->name.buf, config->val.buf); 
     621 
     622        ret = cherokee_vserver_names_add_name (&vserver->domains, &config->val); 
     623        if (ret != ret_ok) return ret; 
     624 
     625        return ret_ok; 
     626} 
     627 
     628 
     629static ret_t  
    612630add_logger (cherokee_config_node_t *config, cherokee_virtual_server_t *vserver) 
    613631{ 
    …… 
    727745                        if (ret != ret_ok) return ret; 
    728746                } 
     747        } else if (equal_buf_str (&conf->key, "domain")) { 
     748                cherokee_config_node_foreach (i, conf) { 
     749                        ret = add_domain (CONFIG_NODE(i), vserver); 
     750                        if (ret != ret_ok) return ret;           
     751                } 
    729752        } else if (equal_buf_str (&conf->key, "error_handler")) { 
    730753                ret = add_error_handler (conf, vserver); 
    …… 
    750773                cherokee_buffer_add_buffer (&vserver->ca_cert, &conf->val); 
    751774                 
    752         } else if (equal_buf_str (&conf->key, "alias")) { 
    753                 /* Ignore it, server config already did this for us.. 
    754                  */ 
    755775        } else { 
    756776                PRINT_MSG ("ERROR: Virtual Server: Unknown key '%s'\n", key); 

  • cherokee/trunk/cherokee/virtual_server.h

    r546 r591  
    4343#include "config_node.h" 
    4444#include "virtual_entries.h" 
     45#include "virtual_server_names.h" 
    4546 
    4647 
    4748typedef struct { 
    4849        cherokee_list_t              list_entry; 
     50        void                        *server_ref;      /* Ref to server */ 
    4951 
    50         cherokee_buffer_t            name;            /* Default name.   Eg: www.alobbs.com */ 
    51         void                        *server_ref;      /* Ref to server */ 
     52        cherokee_buffer_t            name;            /* Name.    Eg: server1 */ 
     53        cherokee_vserver_names_t     domains;         /* Domains. Eg: www.alobbs.com */ 
    5254 
    5355        cherokee_virtual_entries_t   entry; 
    …… 
    101103 
    102104ret_t cherokee_virtual_server_init_tls  (cherokee_virtual_server_t *vserver); 
    103 ret_t cherokee_virtual_server_have_tls  (cherokee_virtual_server_t *vserver); 
     105ret_t cherokee_virtual_server_has_tls   (cherokee_virtual_server_t *vserver); 
    104106 
    105107void  cherokee_virtual_server_add_rx    (cherokee_virtual_server_t *vserver, size_t rx); 

  • cherokee/trunk/qa/020-VirtualHost.py

    r269 r591  
    55CONF = """ 
    66vserver!cherokee.test!document_root = %s 
     7vserver!cherokee.test!domain!1 = cherokee.test 
    78vserver!cherokee.test!directory!/!handler = common 
    89vserver!cherokee.test!directory!/!priority = 10 

  • cherokee/trunk/qa/021-VirtualHost2.py

    r269 r591  
    55CONF = """ 
    66vserver!first.domain!document_root = %s 
    7 vserver!first.domain!alias = second.domain 
     7vserver!first.domain!domain!1 = first.domain 
     8vserver!first.domain!domain!2 = second.domain 
    89vserver!first.domain!directory!/!handler = common 
    910vserver!first.domain!directory!/!priority = 10 

  • cherokee/trunk/qa/044-Home.py

    r269 r591  
    22 
    33CONF = """ 
     4vserver!missing.host1!document_root = /faked 
     5 
    46vserver!missing.host1!user_dir = public_html 
     7vserver!missing.host1!domain!1 = missing.host1 
    58vserver!missing.host1!user_dir!directory!/!handler = common 
    69""" 
    …… 
    1619        self.expected_error   = 404 
    1720 
    18 # "UserDir public_html { Directory / { Handler common }}" 

  • cherokee/trunk/qa/045-Home2.py

    r269 r591  
    66 
    77CONF = """ 
     8vserver!testhost1!document_root = /faked 
     9 
    810vserver!testhost1!user_dir = %s 
     11vserver!testhost1!domain!1 = testhost1 
    912vserver!testhost1!user_dir!directory!/!handler = common 
    1013""" 

  • cherokee/trunk/qa/066-DirectoryIndex3.py

    r491 r591  
    66vserver!directoryindex3!directory_index = index.php,/super_test_index.php 
    77vserver!directoryindex3!document_root = %s 
     8vserver!directoryindex3!domain!1 = directoryindex3 
    89""" 
    910 

  • cherokee/trunk/qa/094-URL-request.py

    r269 r591  
    55CONF = """ 
    66vserver!request1host!document_root = %s 
     7vserver!request1host!domain!1 = request1host 
    78vserver!request1host!directory!/urlrequest1!handler = file 
    89vserver!request1host!directory!/urlrequest1!priority = 10 

  • cherokee/trunk/qa/116-RequestTiny.py

    r491 r591  
    55 
    66CONF = """ 
    7 vserver!%s!document_root = %s 
    8 vserver!%s!directory!/!handler = file 
    9 vserver!%s!directory!/!priority = 10 
     7vserver!<domain>!document_root = %s 
     8vserver!<domain>!domain!1 = <domain> 
     9vserver!<domain>!directory!/!handler = file 
     10vserver!<domain>!directory!/!priority = 10 
    1011 
    11 vserver!%s!request!^/$!handler = redir 
    12 vserver!%s!request!^/$!handler!rewrite!1!show = 0 
    13 vserver!%s!request!^/$!handler!rewrite!1!regex = ^.*$ 
    14 vserver!%s!request!^/$!handler!rewrite!1!substring = /index.php 
    15 vserver!%s!request!^/$!priority = 11 
     12vserver!<domain>!request!^/$!handler = redir 
     13vserver!<domain>!request!^/$!handler!rewrite!1!show = 0 
     14vserver!<domain>!request!^/$!handler!rewrite!1!regex = ^.*$ 
     15vserver!<domain>!request!^/$!handler!rewrite!1!substring = /index.php 
     16vserver!<domain>!request!^/$!priority = 11 
    1617"""  
    1718 
    …… 
    3031        host_dir = self.Mkdir (www, "tmp_host_request_mini") 
    3132 
    32         self.conf = CONF % (HOST, host_dir, HOST, HOST, HOST, HOST, HOST, HOST, HOST) 
     33        self.conf = CONF % (host_dir) 
     34        self.conf = self.conf.replace ('<domain>', HOST) 
     35 
    3336        for php in self.php_conf.split("\n"): 
    3437            self.conf += "vserver!%s!%s\n" % (HOST, php) 

  • cherokee/trunk/qa/117-DomainToDir.py

    r269 r591  
    66 
    77CONF = """ 
    8 vserver!%s!document_root = %s 
    9 vserver!%s!directory!/!handler = redir 
    10 vserver!%s!directory!/!handler!rewrite!1!show = 1 
    11 vserver!%s!directory!/!handler!rewrite!1!regex = ^/(.*)$ 
    12 vserver!%s!directory!/!handler!rewrite!1!substring = %s$1 
    13 vserver!%s!directory!/!priority = 10 
     8vserver!<domain>!document_root = %s 
     9vserver!<domain>!domain!1 = <domain> 
     10vserver!<domain>!directory!/!handler = redir 
     11vserver!<domain>!directory!/!handler!rewrite!1!show = 1 
     12vserver!<domain>!directory!/!handler!rewrite!1!regex = ^/(.*)$ 
     13vserver!<domain>!directory!/!handler!rewrite!1!substring = %s$1 
     14vserver!<domain>!directory!/!priority = 10 
    1415""" 
    1516 
    …… 
    2627    def Prepare (self, www): 
    2728        srvr = self.Mkdir (www, "domain_%s" % (HOST)) 
    28         self.conf = CONF % (HOST, srvr, HOST, HOST, HOST, HOST, URL, HOST) 
    2929 
     30        self.conf = CONF % (srvr, URL) 
     31        self.conf = self.conf.replace ('<domain>', HOST) 

  • cherokee/trunk/qa/121-NoUserDir.py

    r269 r591  
    77 
    88CONF = """ 
    9 vserver!%s!document_root = %s 
    10 vserver!%s!directory!/!handler = common 
    11 vserver!%s!directory!/!priority = 10 
     9vserver!<domain>!document_root = %s 
     10vserver!<domain>!domain!1 = <domain> 
     11vserver!<domain>!directory!/!handler = common 
     12vserver!<domain>!directory!/!priority = 10 
    1213""" 
    1314 
    …… 
    3031        self.WriteFile (d2, FILENAME, 0444, MAGIC); 
    3132 
    32         self.conf = CONF % (SERVER, d, SERVER, SERVER) 
     33        self.conf = CONF % (d) 
     34        self.conf = self.conf.replace ('<domain>', SERVER) 

  • cherokee/trunk/qa/124-DomainToDir2.py

    r269 r591  
    77 
    88CONF = """         
    9 vserver!%s!document_root = %s 
    10 vserver!%s!directory!%s!handler = redir 
    11 vserver!%s!directory!%s!handler!rewrite!1!show = 1 
    12 vserver!%s!directory!%s!handler!rewrite!1!regex = ^(.*)$ 
    13 vserver!%s!directory!%s!handler!rewrite!1!substring = %s$1 
    14 vserver!%s!directory!%s!priority = 10 
     9vserver!<domain>!document_root = %s 
     10vserver!<domain>!domain!1 = <domain> 
     11vserver!<domain>!directory!<dir>!handler = redir 
     12vserver!<domain>!directory!<dir>!handler!rewrite!1!show = 1 
     13vserver!<domain>!directory!<dir>!handler!rewrite!1!regex = ^(.*)$ 
     14vserver!<domain>!directory!<dir>!handler!rewrite!1!substring = %s$1 
     15vserver!<domain>!directory!<dir>!priority = 10 
    1516""" 
    1617 
    …… 
    2829        srvr = self.Mkdir (www, "domain_%s" % (DOMAIN)) 
    2930 
    30         self.conf = CONF % (DOMAIN, srvr, DOMAIN, DIR, DOMAIN, DIR, 
    31                             DOMAIN, DIR, DOMAIN, DIR, URL, DOMAIN, DIR) 
     31        self.conf = CONF % (srvr, URL) 
     32        self.conf = self.conf.replace ('<domain>', DOMAIN) 
     33        self.conf = self.conf.replace ('<dir>', DIR) 
    3234 

  • cherokee/trunk/qa/125-domain-redir1.py

    r269 r591  
    55 
    66CONF = """         
    7 vserver!%s!document_root = %s 
    8 vserver!%s!directory!/!handler = redir 
    9 vserver!%s!directory!/!handler!rewrite!1!show = 1 
    10 vserver!%s!directory!/!handler!rewrite!1!regex = ^/(.*)$ 
    11 vserver!%s!directory!/!handler!rewrite!1!substring = http://www.%s/$1 
    12 vserver!%s!directory!/!priority = 10 
     7vserver!<domain>!document_root = /faked 
    138 
    14 vserver!www.%s!document_root = %s 
    15 vserver!www.%s!directory!/!handler = file 
    16 vserver!www.%s!directory!/!priority = 10 
     9vserver!<domain>!domain!1 = <domain> 
     10vserver!<domain>!directory!/!handler = redir 
     11vserver!<domain>!directory!/!handler!rewrite!1!show = 1 
     12vserver!<domain>!directory!/!handler!rewrite!1!regex = ^/(.*)$ 
     13vserver!<domain>!directory!/!handler!rewrite!1!substring = http://www.<domain>/$1 
     14vserver!<domain>!directory!/!priority = 10 
     15 
     16vserver!www.<domain>!document_root = %s 
     17vserver!www.<domain>!domain!1 = www.<domain> 
     18vserver!www.<domain>!directory!/!handler = file 
     19vserver!www.<domain>!directory!/!priority = 10 
    1720""" 
    1821 
    …… 
    3033        srvr = self.Mkdir (www, "domain_%s" % (DOMAIN)) 
    3134 
    32         self.conf = CONF % (DOMAIN, srvr, DOMAIN, DOMAIN, DOMAIN, DOMAIN, DOMAIN, DOMAIN, 
    33                             DOMAIN, srvr, DOMAIN, DOMAIN) 
    34  
     35        self.conf = CONF % (srvr) 
     36        self.conf = self.conf.replace('<domain>', DOMAIN) 

  • cherokee/trunk/qa/135-RedirParams.py

    r491 r591  
    66 
    77CONF = """ 
    8 vserver!%s!document_root = %s 
     8vserver!<domain>!document_root = %s 
     9vserver!<domain>!domain!1 = <domain> 
    910 
    10 vserver!%s!request!^/([^\?]*)$!handler = redir 
    11 vserver!%s!request!^/([^\?]*)$!handler!rewrite!1!show = 1 
    12 vserver!%s!request!^/([^\?]*)$!handler!rewrite!1!substring = /index.php?q=$1 
    13 vserver!%s!request!^/([^\?]*)$!priority = 1350 
     11vserver!<domain>!request!^/([^\?]*)$!handler = redir 
     12vserver!<domain>!request!^/([^\?]*)$!handler!rewrite!1!show = 1 
     13vserver!<domain>!request!^/([^\?]*)$!handler!rewrite!1!substring = /index.php?q=$1 
     14vserver!<domain>!request!^/([^\?]*)$!priority = 1350 
    1415 
    15 vserver!%s!request!^/([^\?]*)\?(.*)$!handler = redir 
    16 vserver!%s!request!^/([^\?]*)\?(.*)$!handler!rewrite!2!show = 1 
    17 vserver!%s!request!^/([^\?]*)\?(.*)$!handler!rewrite!2!substring = /index.php?q=$1&$2 
    18 vserver!%s!request!^/([^\?]*)\?(.*)$!priority = 1351 
     16vserver!<domain>!request!^/([^\?]*)\?(.*)$!handler = redir 
     17vserver!<domain>!request!^/([^\?]*)\?(.*)$!handler!rewrite!2!show = 1 
     18vserver!<domain>!request!^/([^\?]*)\?(.*)$!handler!rewrite!2!substring = /index.php?q=$1&$2 
     19vserver!<domain>!request!^/([^\?]*)\?(.*)$!priority = 1351 
    1920""" 
    2021 
    …… 
    3233        d2 = self.Mkdir (d, "hidde_w_params") 
    3334 
    34         self.conf = CONF % (SERVER, d, SERVER, SERVER, SERVER, 
    35                             SERVER, SERVER, SERVER, SERVER, SERVER) 
     35        self.conf = CONF % (d) 
     36        self.conf = self.conf.replace ('<domain>', SERVER) 
    3637 
    3738    def Precondition (self):