bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-10-31 02:12:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

gui: move config-site.php to $sysconfdir/piler directory

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2017-10-29 11:01:39 +01:00
parent 0232f3cb81
commit 2cc0dd65fc
3 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@@ -4635,17 +4635,6 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
#define VIRUS_TEMPLATE "$my_prefix/share/clapf/template.virus"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define ZOMBIE_NET_REGEX "$my_prefix/share/clapf/zombienets.regex"
_ACEOF
if test "$have_mysql" = "no" && test "$have_psql" = "no"; then if test "$have_mysql" = "no" && test "$have_psql" = "no"; then
echo echo
echo "please specify the used database with --with-database=..." echo "please specify the used database with --with-database=..."
@@ -4674,15 +4663,6 @@ $as_echo "#define HAVE_DAEMON 0" >>confdefs.h
if test -x /usr/xpg4/bin/id; then id_bin="/usr/xpg4/bin/id"; fi if test -x /usr/xpg4/bin/id; then id_bin="/usr/xpg4/bin/id"; fi
fi fi
if test `echo $os | grep -c CYGWIN` -eq 1; then
defs="$defs -DCYGWIN"
cat >>confdefs.h <<_ACEOF
#define ZOMBIE_NET_REGEX "zombienets.regex"
_ACEOF
fi
if test "$have_clamd" = "yes" ; then if test "$have_clamd" = "yes" ; then
defs="$defs -DHAVE_ANTIVIRUS" defs="$defs -DHAVE_ANTIVIRUS"
@@ -4880,7 +4860,7 @@ CFLAGS="$static -O2 -Wall -g"
LIBS="$antispam_libs $sunos_libs " LIBS="$antispam_libs $sunos_libs "
OBJS="dirs.o base64.o misc.o counters.o cfg.o sig.o decoder.o hash.o parser.o parser_utils.o rules.o smtp.o session.o bdat.o message.o attachment.o digest.o store.o archive.o tai.o import.o import_maildir.o import_mailbox.o import_pop3.o import_imap.o imap.o pop3.o extract.o mydomains.o $objs" OBJS="dirs.o base64.o misc.o counters.o cfg.o sig.o decoder.o hash.o parser.o parser_utils.o rules.o smtp.o session.o bdat.o message.o attachment.o digest.o store.o archive.o tai.o import.o import_maildir.o import_mailbox.o import_pop3.o import_imap.o imap.o pop3.o extract.o mydomains.o $objs"
ac_config_files="$ac_config_files Makefile src/Makefile etc/Makefile util/Makefile init.d/Makefile unit_tests/Makefile contrib/imap/Makefile" ac_config_files="$ac_config_files Makefile src/Makefile etc/Makefile util/Makefile init.d/Makefile unit_tests/Makefile contrib/imap/Makefile webui/config.php"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
@@ -5580,6 +5560,7 @@ do
"init.d/Makefile") CONFIG_FILES="$CONFIG_FILES init.d/Makefile" ;; "init.d/Makefile") CONFIG_FILES="$CONFIG_FILES init.d/Makefile" ;;
"unit_tests/Makefile") CONFIG_FILES="$CONFIG_FILES unit_tests/Makefile" ;; "unit_tests/Makefile") CONFIG_FILES="$CONFIG_FILES unit_tests/Makefile" ;;
"contrib/imap/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/imap/Makefile" ;; "contrib/imap/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/imap/Makefile" ;;
"webui/config.php") CONFIG_FILES="$CONFIG_FILES webui/config.php" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac esac
@@ -6204,6 +6185,6 @@ fi
echo echo
echo echo
echo "IMPORTANT! If you upgrade, be sure to read http://www.mailpiler.org/en/upgrade.html" echo "IMPORTANT! If you upgrade, be sure to read http://www.mailpiler.org/wiki/current:upgrade"
echo echo
echo echo

12
configure.in
View File

@@ -356,9 +356,6 @@ AC_SUBST(DATAROOTDIR)
AC_DEFINE_UNQUOTED(DATAROOTDIR,"$dataroot_dir",[where to look for the share data files]) AC_DEFINE_UNQUOTED(DATAROOTDIR,"$dataroot_dir",[where to look for the share data files])
AC_DEFINE_UNQUOTED(VIRUS_TEMPLATE, "$my_prefix/share/clapf/template.virus", [where the virus template is])
AC_DEFINE_UNQUOTED(ZOMBIE_NET_REGEX, "$my_prefix/share/clapf/zombienets.regex", [where the virus template is])
if test "$have_mysql" = "no" && test "$have_psql" = "no"; then if test "$have_mysql" = "no" && test "$have_psql" = "no"; then
echo echo
@@ -387,11 +384,6 @@ if test "$os" = "SunOS"; then
if test -x /usr/xpg4/bin/id; then id_bin="/usr/xpg4/bin/id"; fi if test -x /usr/xpg4/bin/id; then id_bin="/usr/xpg4/bin/id"; fi
fi fi
if test `echo $os | grep -c CYGWIN` -eq 1; then
defs="$defs -DCYGWIN"
AC_DEFINE_UNQUOTED(ZOMBIE_NET_REGEX, "zombienets.regex", [where the virus template is])
fi
dnl whether we have antivirus support dnl whether we have antivirus support
if test "$have_clamd" = "yes" ; then if test "$have_clamd" = "yes" ; then
@@ -546,12 +538,12 @@ CFLAGS="$static -O2 -Wall -g"
LIBS="$antispam_libs $sunos_libs " LIBS="$antispam_libs $sunos_libs "
OBJS="dirs.o base64.o misc.o counters.o cfg.o sig.o decoder.o hash.o parser.o parser_utils.o rules.o smtp.o session.o bdat.o message.o attachment.o digest.o store.o archive.o tai.o import.o import_maildir.o import_mailbox.o import_pop3.o import_imap.o imap.o pop3.o extract.o mydomains.o $objs" OBJS="dirs.o base64.o misc.o counters.o cfg.o sig.o decoder.o hash.o parser.o parser_utils.o rules.o smtp.o session.o bdat.o message.o attachment.o digest.o store.o archive.o tai.o import.o import_maildir.o import_mailbox.o import_pop3.o import_imap.o imap.o pop3.o extract.o mydomains.o $objs"
AC_CONFIG_FILES([Makefile src/Makefile etc/Makefile util/Makefile init.d/Makefile unit_tests/Makefile contrib/imap/Makefile]) AC_CONFIG_FILES([Makefile src/Makefile etc/Makefile util/Makefile init.d/Makefile unit_tests/Makefile contrib/imap/Makefile webui/config.php])
AC_OUTPUT AC_OUTPUT
echo echo
echo echo
echo "IMPORTANT! If you upgrade, be sure to read http://www.mailpiler.org/en/upgrade.html" echo "IMPORTANT! If you upgrade, be sure to read http://www.mailpiler.org/wiki/current:upgrade"
echo echo
echo echo

2
webui/config.php → webui/config.php.in
View File

@@ -318,7 +318,7 @@ define('NOW', time());
* normally you don't have to change anything below * normally you don't have to change anything below
*/ */
require_once 'config-site.php'; require_once '@sysconfdir@/piler/config-site.php';
ini_set('session.cookie_lifetime', $config['SESSION_EXPIRY']); ini_set('session.cookie_lifetime', $config['SESSION_EXPIRY']);