Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 469

Show
Ignore:
Timestamp:
04/10/07 23:01:25 (2 years ago)
Author:
malte
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tools/BSDmakefile

    r154 r469  
    66install: 
    77        cd ./build && $(MAKE) install  
    8         cd ./daemon && $(MAKE) vhcs2_daemon 
     8        cd ./daemon && $(MAKE) ispcp_daemon 
    99        $(SYSTEM_MAKE_DIRS) $(DAEMON_DIR) 
    10         cp ./daemon/vhcs2_daemon $(DAEMON_DIR)  
     10        cp ./daemon/ispcp_daemon $(DAEMON_DIR)  
    1111 
    1212uninstall: 

  • trunk/tools/Makefile

    r154 r469  
    66install: 
    77        cd ./build && $(MAKE) install  
    8         cd ./daemon && $(MAKE) vhcs2_daemon 
     8        cd ./daemon && $(MAKE) ispcp_daemon 
    99        $(SYSTEM_MAKE_DIRS) $(DAEMON_DIR) 
    10         cp ./daemon/vhcs2_daemon $(DAEMON_DIR)  
     10        cp ./daemon/ispcp_daemon $(DAEMON_DIR)  
    1111 
    1212uninstall: 

  • trunk/tools/build/BSDmakefile

    r154 r469  
    33install: 
    44 
    5         $(CMD_INSTALL) ./vhcs2-mkdirs.pl /usr/sbin 
     5        $(CMD_INSTALL) ./ispcp-mkdirs.pl /usr/sbin 
    66 
    77uninstall: 
    88 
    9         rm -rf /usr/sbin/vhcs2-mkdirs.pl 
     9        rm -rf /usr/sbin/ispcp-mkdirs.pl 
    1010 
    1111 

  • trunk/tools/build/Makefile

    r154 r469  
    66install: 
    77 
    8         $(CMD_INSTALL) ./vhcs2-mkdirs.pl /usr/sbin 
     8        $(CMD_INSTALL) ./ispcp-mkdirs.pl /usr/sbin 
    99 
    1010uninstall: 
    1111 
    12         rm -rf /usr/sbin/vhcs2-mkdirs.pl 
     12        rm -rf /usr/sbin/ispcp-mkdirs.pl 
    1313 
    1414 

  • trunk/tools/daemon/BSDmakefile

    r384 r469  
    1 # VHCS(tm) - Virtual Hosting Control System 
    2 # Copyright (c) 2001-2004 by moleSoftware GmbH 
    3 # http://www.molesoftware.com 
    41# 
     2#  ispCP . (OMEGA) - Virtual Hosting Control System | Omega Version 
    53# 
    6 # License: 
    7 #    This program is free software; you can redistribute it and/or 
    8 #    modify it under the terms of the MPL Mozilla Public License 
    9 #    as published by the Free Software Foundation; either version 1.1     
    10 #    of the License, or (at your option) any later version. 
     4#  @copyright  2001-2006 by moleSoftware GmbH 
     5#  @copyright  2006-2007 by ispCP | http://isp-control.net 
     6#  @link   http://isp-control.net 
     7#  @author  ispCP Team 
    118# 
    12 #    This program is distributed in the hope that it will be useful, 
    13 #    but WITHOUT ANY WARRANTY; without even the implied warranty of 
    14 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
    15 #    MPL Mozilla Public License for more details. 
    16 #     
    17 #    You may have received a copy of the MPL Mozilla Public License 
    18 #    along with this program. 
    19 #     
    20 #    An on-line copy of the MPL Mozilla Public License can be found 
    21 #    http://www.mozilla.org/MPL/MPL-1.1.html 
     9#  @license 
     10#  This program is free software; you can redistribute it and/or modify it under 
     11#  the terms of the MPL General Public License as published by the Free Software 
     12#  Foundation; either version 1.1 of the License, or (at your option) any later 
     13#  version. 
     14#  You should have received a copy of the MPL Mozilla Public License along with 
     15#  this program; if not, write to the Open Source Initiative (OSI) 
     16#  http://opensource.org | osi@opensource.org 
    2217# 
    23 # 
    24 # The VHCS Home Page is at: 
    25 # 
    26 #    http://www.vhcs.net 
    2718 
    28  
    29 OBJS = vhcs_daemon.o message.o daemon_init.o say.o signal-handlers.o\ 
     19OBJS = ispcp_daemon.o message.o daemon_init.o say.o signal-handlers.o\ 
    3020receive_data.o send_data.o take_connection.o send_line.o recv_line.o\ 
    3121helo_cmd.o helo_syntax.o lr_cmd.o lr_syntax.o bye_cmd.o bye_syntax.o 
    …… 
    3727STRIP = strip -s 
    3828 
    39 vhcs2_daemon: $(OBJS) 
    40         $(BUILD) vhcs2_daemon $(OBJS) 
    41         $(STRIP) vhcs2_daemon 
     29ispcp_daemon: $(OBJS) 
     30        $(BUILD) ispcp_daemon $(OBJS) 
     31        $(STRIP) ispcp_daemon 
    4232         
    43 vhcs_daemon.o: vhcs_daemon.c defs.h 
    44         $(COMPILE) vhcs_daemon.o vhcs_daemon.c 
     33ispcp_daemon.o: ispcp_daemon.c defs.h 
     34        $(COMPILE) ispcp_daemon.o ispcp_daemon.c 
    4535 
    4636daemon_init.o: daemon_init.c daemon_init.h 
    …… 
    9484        rm -rf *~ 
    9585        rm -rf *.o 
    96         rm -rf vhcs2_daemon 
     86        rm -rf ispcp_daemon 
    9787 

  • trunk/tools/daemon/defs.h

    r154 r469  
    177177 
    178178char *messages_array[MSG_MAX_COUNT][1] = { 
    179     {"250 OK moleSoftware VHCS2 Server Welcomes You !\r\n"}, 
    180     {"moleSoftware vhcs_daemon v2.02 started !"}, 
    181     {"vhcs2_daemon"}, 
     179    {"250 OK ispCP Server Welcomes You !\r\n"}, 
     180    {"ispCP_daemon v1.0 started !"}, 
     181    {"ispcp_daemon"}, 
    182182    {"listen() error: %s"}, 
    183183    {"child %s terminated !"}, 
    …… 
    198198    {"license status"}, 
    199199    {"execute query"}, 
    200     {"VHCS Pro configuration file not found !"}, 
    201     {"VHCS Pro license data cannot be found in the config file !"}, 
     200    {"ispCP configuration file not found !"}, 
     201    {"ispCP data cannot be found in the config file !"}, 
    202202    {"Connect to license-server: socket() error [%s]!"}, 
    203203    {"Connect to license-server: connect() error [%s]!"}, 
    204     {"250 OK moleSoftware Licnese Server Welcomes You !\r\n"}, 
     204    {"250 OK ispCP Server Welcomes You !\r\n"}, 
    205205    {"999 ERR License error !\r\n"}, 
    206206    {"bind() error: %s ! \r\n Please check for another daemon runing !\r\n "} 
    …… 
    210210 
    211211/* 
    212  BEGIN: vhcs_daemon variables 
     212 BEGIN: ispcp_daemon variables 
    213213 */ 
    214214 
    …… 
    222222 
    223223/* 
    224  END: vhcs_daemon variables 
     224 END: ispcp_daemon variables 
    225225 */ 
    226226 

  • trunk/tools/daemon/lr_syntax.c

    r449 r469  
    7777                                memset (fname2, 0, sizeof (fname2)); 
    7878                                if (readlink (fname1, fname2, sizeof (fname2)) > 0) { 
    79                                         strncpy(daemon_path, fname2, strlen(fname2)-strlen("daemon/vhcs2_daemon")); 
    80                                         strcat(daemon_path, "engine/vhcs2-rqst-mngr"); 
     79                                        strncpy(daemon_path, fname2, strlen(fname2)-strlen("daemon/ispcp_daemon")); 
     80                                        strcat(daemon_path, "engine/ispcp-rqst-mngr"); 
    8181 
    8282                                        fdres = open ( "/dev/null", O_RDONLY ); 
    …… 
    126126                                        else if( dupres != fdres) close (fdres); 
    127127 
    128                                         execl( daemon_path, "vhcs2-rqst-mngr" ,(char*)NULL ); 
     128                                        execl( daemon_path, "ispcp-rqst-mngr" ,(char*)NULL ); 
    129129                                        #endif 
    130130 

  • trunk/tools/daemon/lr_syntax.h

    r154 r469  
    5959#if defined(__OpenBSD__) || defined(__FreeBSD__) 
    6060 
    61 #define QUERY_CMD "/var/www/vhcs2/engine/vhcs2-rqst-mngr" 
     61#define QUERY_CMD "/var/www/ispcp/engine/ispcp-rqst-mngr" 
    6262 
    6363#endif 
    6464 
    65 #define LOG_DIR "/var/log/vhcs2" 
     65#define LOG_DIR "/var/log/ispcp" 
    6666 
    67 #define STDOUT_LOG "vhcs2_daemon-stdout-log" 
     67#define STDOUT_LOG "ispcp_daemon-stdout-log" 
    6868 
    69 #define STDERR_LOG "vhcs2_daemon-stderr-log" 
     69#define STDERR_LOG "ispcp_daemon-stderr-log" 
    7070 
    7171extern char *message(int message_number);