Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Ticket #1324: patch-20080530

File patch-20080530, 6.5 kB (added by Blocker, 6 months ago)
Line 
1 Index: gui/reseller/users.php
2 ===================================================================
3 --- gui/reseller/users.php      (revision 1184)
4 +++ gui/reseller/users.php      (working copy)
5 @@ -112,7 +112,8 @@
6                         'TR_TITLE_BACK' => tr('Return to previous menu'),
7                         'TR_TABLE_NAME' => tr('Users list'),
8                         'TR_MESSAGE_CHANGE_STATUS' => tr('Are you sure you want to change the status of domain account?', true),
9 -                       'TR_MESSAGE_DELETE_ACCOUNT' => tr('Are you sure you want to delete this account?', true),
10 +                       'TR_MESSAGE_DELETE_ACCOUNT' => tr('Please use this tool with caution as once the user is deleted, '.
11 +                       'there is no way to get the files/database, etc back. Are you sure you want to delete this account?',true),
12                         'TR_STAT' => tr('Stats'),
13                         'VL_MONTH' => $crnt_month,
14                         'VL_YEAR' => $crnt_year,
15 Index: configs/freebsd/ispcp.conf
16 ===================================================================
17 --- configs/freebsd/ispcp.conf  (revision 1184)
18 +++ configs/freebsd/ispcp.conf  (working copy)
19 @@ -174,7 +174,7 @@
20  
21  AWSTATS_CONFIG_DIR = /usr/local/etc/awstats
22  
23 -AWSTATS_ENGINE_DIR = /usr/lib/cgi-bin
24 +AWSTATS_ENGINE_DIR = /usr/local/www/awstats/cgi-bin
25  
26  AWSTATS_WEB_DIR = /usr/local/www/data/awstats
27  
28 Index: configs/freebsd/cron.d/parts/dmn_awstats_entry.tpl
29 ===================================================================
30 --- configs/freebsd/cron.d/parts/dmn_awstats_entry.tpl  (revision 1184)
31 +++ configs/freebsd/cron.d/parts/dmn_awstats_entry.tpl  (working copy)
32 @@ -1 +1 @@
33 -{MINUTE} {HOUR}  * * *   root perl {AWSTATS_ROOT_DIR}/awstats_buildstaticpages.pl -config={DMN_NAME} -update -lang={USER_LANG} -awstatsprog={AWSTATS_ENGINE_DIR}/awstats.pl -dir={AWSTATS_WEB_DIR}/{DMN_NAME}/statistics/ >/dev/null 2>&1
34 \ No newline at end of file
35 +{MINUTE} {HOUR}  * * *   perl {AWSTATS_ROOT_DIR}/awstats_buildstaticpages.pl -config={DMN_NAME} -update -lang={USER_LANG} -awstatsprog={AWSTATS_ENGINE_DIR}/awstats.pl -dir={AWSTATS_WEB_DIR}/{DMN_NAME}/statistics/ >/dev/null 2>&1
36 Index: configs/freebsd/cron.d/ispcp
37 ===================================================================
38 --- configs/freebsd/cron.d/ispcp        (revision 1184)
39 +++ configs/freebsd/cron.d/ispcp        (working copy)
40 @@ -2,37 +2,37 @@
41  # delayed tasks START.
42  
43  # Quota
44 -@daily root {QUOTA_ROOT_DIR}/ispcp-dsk-quota &>{LOG_DIR}/ispcp-dsk-quota.log
45 +@daily {QUOTA_ROOT_DIR}/ispcp-dsk-quota &>{LOG_DIR}/ispcp-dsk-quota.log
46  
47  # Traffic
48 -0,30   *       *       *       *  root {TRAFF_ROOT_DIR}/ispcp-srv-traff &>{LOG_DIR}/ispcp-srv-traff.log
49 -0,30   *       *       *       *  root {TRAFF_ROOT_DIR}/ispcp-vrl-traff &>{LOG_DIR}/ispcp-vrl-traff.log
50 -15,45  *       *       *       *  root {TRAFF_ROOT_DIR}/ispcp-vrl-traff-correction &>{LOG_DIR}/ispcp-vrl-traff-correction.log
51 +0,30   *       *       *       *  {TRAFF_ROOT_DIR}/ispcp-srv-traff &>{LOG_DIR}/ispcp-srv-traff.log
52 +0,30   *       *       *       *  {TRAFF_ROOT_DIR}/ispcp-vrl-traff &>{LOG_DIR}/ispcp-vrl-traff.log
53 +15,45  *       *       *       *  {TRAFF_ROOT_DIR}/ispcp-vrl-traff-correction &>{LOG_DIR}/ispcp-vrl-traff-correction.log
54  
55  # customer logs
56 -@daily root {TOOLS_ROOT_DIR}/ispcp-httpd-logs-mngr &>{LOG_DIR}/ispcp-httpd-logs-mngr.log
57 +@daily {TOOLS_ROOT_DIR}/ispcp-httpd-logs-mngr &>{LOG_DIR}/ispcp-httpd-logs-mngr.log
58  
59  # Backup
60 -@daily root {BACKUP_ROOT_DIR}/ispcp-backup-all yes &>{LOG_DIR}/ispcp-backup-all-mngr.log
61 -@daily root {BACKUP_ROOT_DIR}/ispcp-backup-ispcp noreport &>{LOG_DIR}/ispcp-backup-ispcp-mngr.log
62 +@daily {BACKUP_ROOT_DIR}/ispcp-backup-all yes &>{LOG_DIR}/ispcp-backup-all-mngr.log
63 +@daily {BACKUP_ROOT_DIR}/ispcp-backup-ispcp noreport &>{LOG_DIR}/ispcp-backup-ispcp-mngr.log
64  
65  # Remove config backups older than seven days
66 -@daily root find {CONF_DIR}/*/backup/* -maxdepth 0 -type f -mtime +7 -print | egrep '.*\.[0-9]+$' | xargs -r /bin/rm
67 +@daily find {CONF_DIR}/*/backup/* -maxdepth 0 -type f -mtime +7 -print | egrep '.*\.[0-9]+$' | xargs -r /bin/rm
68  
69  # Remove Daemon Logs older than 14 days (except .gz files)
70 -@daily root find {LOG_DIR}/* -maxdepth 1 -type f -mtime +14 -print | egrep '.*\.gz$' | xargs -r /bin/rm
71 +@daily find {LOG_DIR}/* -maxdepth 1 -type f -mtime +14 -print | egrep '.*\.gz$' | xargs -r /bin/rm
72  
73  # AWStats
74 -{AW-ENABLED}15 */6     *       *       *       root {AWSTATS_ROOT_DIR}/awstats_updateall.pl now -awstatsprog={AWSTATS_ENGINE_DIR}/awstats.pl >/dev/null 2>&1
75 +{AW-ENABLED}15 */6     *       *       *       {AWSTATS_ROOT_DIR}/awstats_updateall.pl now -awstatsprog={AWSTATS_ENGINE_DIR}/awstats.pl >/dev/null 2>&1
76  
77  # Rootkit Hunter
78 -{RK-ENABLED}0  */12    *       *       *       root {RKHUNTER} --scan-knownbad-files --check-deleted --createlogfile --cronjob --createlogfile {RKHUNTER_LOG} >/dev/null 2>&1
79 +{RK-ENABLED}0  */12    *       *       *       {RKHUNTER} --scan-knownbad-files --check-deleted --createlogfile --cronjob --createlogfile {RKHUNTER_LOG} >/dev/null 2>&1
80  
81  # Chkrootkit
82 -{CR-ENABLED}0  */12    *       *       *       root {CHKROOTKIT} &> {CHKROOTKIT_LOG}
83 +{CR-ENABLED}0  */12    *       *       *       {CHKROOTKIT} &> {CHKROOTKIT_LOG}
84  
85  # Look for and purge old sessions every 30 minutes
86 -0,30 *     * * *     root   {TOOLS_ROOT_DIR}/ispcpphptemp.sh >/dev/null 2>&1
87 +0,30 *     * * *     {TOOLS_ROOT_DIR}/ispcpphptemp.sh >/dev/null 2>&1
88  
89  # [{DMN_NAME}] backup task START.
90  # [{DMN_NAME}] backup task END.
91 Index: engine/ispcp-dmn-mngr
92 ===================================================================
93 --- engine/ispcp-dmn-mngr       (revision 1184)
94 +++ engine/ispcp-dmn-mngr       (working copy)
95 @@ -2427,10 +2427,18 @@
96         #
97         # Now we'll proceed system config;
98         #
99 -       $rs = sys_command_rs("$main::cfg{'CMD_CP'} /etc/cron.d/ispcp $backup_cfg");
100 +       if ($main::cfg{'ROOT_GROUP'} eq "wheel") {
101 +               $rs = sys_command_rs("$main::cfg{'CMD_CP'} /var/cron/tabs/root $backup_cfg");
102 +       } else {
103 +               $rs = sys_command_rs("$main::cfg{'CMD_CP'} /etc/cron.d/ispcp $backup_cfg");
104 +       }
105         return $rs if ($rs != 0);
106  
107 -       $rs = sys_command_rs("$main::cfg{'CMD_CP'} -f $working_cfg /etc/cron.d/");
108 +       if ($main::cfg{'ROOT_GROUP'} eq "wheel") {
109 +               $rs = sys_command_rs("$main::cfg{'CMD_CRONTAB'} -u root $working_cfg");
110 +       } else {
111 +               $rs = sys_command_rs("$main::cfg{'CMD_CP'} -f $working_cfg /etc/cron.d/");
112 +       }
113         return $rs if ($rs != 0);
114  
115         push_el(\@main::el, 'dmn_add_crontab_data()', 'Ending...');
116 @@ -3672,4 +3680,4 @@
117         dump_el(\@main::el, $main::ispcp_dmn_mngr_el);
118         exit 1;
119  }
120 -exit 0;
121 \ No newline at end of file
122 +exit 0;
123 Index: BSDmakefile
124 ===================================================================
125 --- BSDmakefile (revision 1184)
126 +++ BSDmakefile (working copy)
127 @@ -30,6 +30,11 @@
128  #    http://isp-control.net
129  #
130  
131 +# This is a TODO list:
132 +# CLOSE:       there is no /etc/cron.d/ispcp is freebsd
133 +# CLOSE:       wrong path and format awstats cronjob
134 +# OPEN:                scoreboard dir not created
135 +# OPEN:                Under jail, system still in heavy testing
136  
137  .ifdef $(OSTYPE)==FreeBSD
138  .include <Makefile.fbsd>