Changeset 435
- Timestamp:
- 03/22/07 00:09:58
(2 years ago)
- Author:
- rats
- Message:
* OpenBSD: fixed bug #119: wrong filename of the BSDMakefile
- fixed bug #120: missing '$'
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r431 |
r435 |
|
| 11 | 11 | | * gui: disable stats-alias in client menu | |
|---|
| 12 | 12 | \_________________________________________________________________/ |
|---|
| | 13 | |
|---|
| | 14 | 2007-03-21 Benedikt Heintel |
|---|
| | 15 | - DISTS: |
|---|
| | 16 | * RedHat: Added config files |
|---|
| | 17 | * OpenBSD: fixed bug #119: wrong filename of the BSDMakefile |
|---|
| | 18 | - ENGINE: |
|---|
| | 19 | * fixed bug #120: missing '$' |
|---|
| 13 | 20 | |
|---|
| 14 | 21 | 2007-03-18 Benedikt Heintel |
|---|
| r341 |
r435 |
|
| 14 | 14 | cp -R ./working $(SYSTEM_CONF)/apache |
|---|
| 15 | 15 | cp -R ./httpd.conf $(ROOT_APACHE_CONF)/vhcs2.conf |
|---|
| 16 | | cp -R ./fastcgi.conf ${ROOT_APACHE_CONF}/mods-available/fastcgi.conf |
|---|
| | 16 | cp -R ./fastcgi.conf ${ROOT_APACHE_CONF}/fastcgi.conf |
|---|
| 17 | 17 | |
|---|
| 18 | 18 | uninstall: |
|---|
| r432 |
r435 |
|
| 1 | | export |
|---|
| | 1 | .include <../../../../Makefile.inc> |
|---|
| 2 | 2 | |
|---|
| 3 | 3 | install: |
|---|
| r425 |
r435 |
|
| 2516 | 2516 | } |
|---|
| 2517 | 2517 | |
|---|
| | 2518 | if (! -e $main::cfg{'FTPD_CONF_FILE'}) { |
|---|
| | 2519 | $rs = set_conf_val('FTPD_CONF_FILE', '/etc/proftpd/proftpd.conf'); |
|---|
| | 2520 | return $rs if ($rs != 0); |
|---|
| | 2521 | |
|---|
| | 2522 | $rs = store_conf(); |
|---|
| | 2523 | return $rs if ($rs != 0); |
|---|
| | 2524 | } |
|---|
| | 2525 | |
|---|
| 2518 | 2526 | if (! -e "$bk_dir/proftpd.conf.vhcs2") { |
|---|
| 2519 | | |
|---|
| 2520 | | if (! -e $main::cfg{'FTPD_CONF_FILE'}) { |
|---|
| 2521 | | $main::ua{'ftpd_conf_file'} = '/etc/proftpd/proftpd.conf'; |
|---|
| 2522 | | $rs = set_conf_val('FTPD_CONF_FILE', $main::ua{'ftpd_conf_file'}); |
|---|
| 2523 | | |
|---|
| 2524 | | return $rs if ($rs != 0); |
|---|
| 2525 | | |
|---|
| 2526 | | $rs = store_conf(); |
|---|
| 2527 | | |
|---|
| 2528 | | return $rs if ($rs != 0); |
|---|
| 2529 | | } |
|---|
| 2530 | 2527 | |
|---|
| 2531 | 2528 | $cmd = "$main::cfg{'CMD_CP'} -p $main::cfg{'FTPD_CONF_FILE'} $bk_dir/proftpd.conf.system"; |
|---|
| r434 |
r435 |
|
| 1962 | 1962 | return $rs if ($rs != 0); |
|---|
| 1963 | 1963 | |
|---|
| 1964 | | $rs = setfmode("$root_dir/gui/errordocs/error_top.jpg", $sys_user, httpd_gid, 0640); |
|---|
| | 1964 | $rs = setfmode("$root_dir/gui/errordocs/error_top.jpg", $sys_user, $httpd_gid, 0640); |
|---|
| 1965 | 1965 | return $rs if ($rs != 0); |
|---|
| 1966 | 1966 | } |
|---|
| … | … | |
| 1981 | 1981 | return $rs if ($rs != 0); |
|---|
| 1982 | 1982 | |
|---|
| 1983 | | $rs = setfmode("$root_dir/gui/errordocs/error_top.jpg", $sys_user, httpd_gid, 0640); |
|---|
| | 1983 | $rs = setfmode("$root_dir/gui/errordocs/error_top.jpg", $sys_user, $httpd_gid, 0640); |
|---|
| 1984 | 1984 | return $rs if ($rs != 0); |
|---|
| 1985 | 1985 | } |
|---|
| … | … | |
| 2000 | 2000 | return $rs if ($rs != 0); |
|---|
| 2001 | 2001 | |
|---|
| 2002 | | $rs = setfmode("$root_dir/gui/errordocs/error_top.jpg", $sys_user, httpd_gid, 0640); |
|---|
| | 2002 | $rs = setfmode("$root_dir/gui/errordocs/error_top.jpg", $sys_user, $httpd_gid, 0640); |
|---|
| 2003 | 2003 | return $rs if ($rs != 0); |
|---|
| 2004 | 2004 | } |
|---|
| … | … | |
| 2019 | 2019 | return $rs if ($rs != 0); |
|---|
| 2020 | 2020 | |
|---|
| 2021 | | $rs = setfmode("$root_dir/gui/errordocs/error_top.jpg", $sys_user, httpd_gid, 0640); |
|---|
| | 2021 | $rs = setfmode("$root_dir/gui/errordocs/error_top.jpg", $sys_user, $httpd_gid, 0640); |
|---|
| 2022 | 2022 | return $rs if ($rs != 0); |
|---|
| 2023 | 2023 | } |
|---|
| … | … | |
| 2052 | 2052 | return $rs if ($rs != 0); |
|---|
| 2053 | 2053 | |
|---|
| 2054 | | $rs = setfmode("$www_dir/$dmn_name/htdocs/images", $sys_user, httpd_gid, 0640); |
|---|
| | 2054 | $rs = setfmode("$www_dir/$dmn_name/htdocs/images", $sys_user, $httpd_gid, 0640); |
|---|
| 2055 | 2055 | return $rs if ($rs != 0); |
|---|
| 2056 | 2056 | |
|---|
|