# This is a combination of 3 commits.
# The first commit's message is:
add domain-bulk-import, fixes #1452

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

# This is the 2nd commit message:

re-work findDirs()-function

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

# This is the 3rd commit message:

Fixing bug #1459 Postfix mysql_table

Fixed deprecated Postfix templates …
# This is a combination of 4 commits.
# The first commit's message is:
outsource a few directory-functions in a class; make apache-2.4 not create 'require all granted' if there is an active directory-protection or option set for the customerroot-dir, possibly fixes #1455

Conflicts:

templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_my
sql-virtual_alias_maps.cf

templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_my
sql-virtual_sender_permissions.cf

templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_my
sql-virtual_alias_maps.cf

templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_my
sql-virtual_sender_permissions.cf

templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mys
ql-virtual_mailbox_domains.cf

templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mys
ql-virtual_sender_permissions.cf

templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-v
irtual_alias_maps.cf

templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virt
ual_sender_permissions.cf

templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mys
ql-virtual_alias_maps.cf

templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mys
ql-virtual_mailbox_domains.cf

templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_alia
s_maps.cf

templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysq
l-virtual_mailbox_domains.cf

templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysq
l-virtual_sender_permissions.cf

templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysq
l-virtual_sender_permissions.cf

# This is the 2nd commit message:

Basic auth realms now work for Nginx Vhosts too

# This is the 3rd commit message:

Fixed indentation of location-block in Nginx Vhosts

# This is the 4th commit message:

set max-age for Strict-Transport-Security header to >180days, thx to priority

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 5 commits.

# The first commit's message is:
add domain-bulk-import, fixes #1452

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

# This is the 2nd commit message:

re-work findDirs()-function

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

# This is the 3rd commit message:

Fixing bug #1459 Postfix mysql_table

Fixed deprecated Postfix templates …

# This is the 4th commit message:

outsource a few directory-functions in a class; make apache-2.4 not
create 'require all granted' if there is an active directory-protection
or option set for the customerroot-dir, possibly fixes #1455

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

# This is the 2nd commit message:

Fix for duplicate htpasswd entries (Nginx)

# This is the 3rd commit message:

improved traffic report

Signed-off-by: Marco Vogt (vogti) <mail@mdvogt.de>
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 4 commits.

# The first commit's message is:
outsource a few directory-functions in a class; make apache-2.4 not
create 'require all granted' if there is an active directory-protection
or option set for the customerroot-dir, possibly fixes #1455

Conflicts:

templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_my
sql-virtual_alias_maps.cf

templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_my
sql-virtual_sender_permissions.cf

templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_my
sql-virtual_alias_maps.cf

templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_my
sql-virtual_sender_permissions.cf

templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mys
ql-virtual_mailbox_domains.cf

templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_mys
ql-virtual_sender_permissions.cf

templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-v
irtual_alias_maps.cf

templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virt
ual_sender_permissions.cf

templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mys
ql-virtual_alias_maps.cf

templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_mys
ql-virtual_mailbox_domains.cf

templates/misc/configfiles/sle_10/postfix/etc_postfix_mysql-virtual_alia
s_maps.cf

templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysq
l-virtual_mailbox_domains.cf

templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_mysq
l-virtual_sender_permissions.cf

templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_mysq
l-virtual_sender_permissions.cf

# This is the 2nd commit message:

Basic auth realms now work for Nginx Vhosts too

# This is the 3rd commit message:

Fixed indentation of location-block in Nginx Vhosts

# This is the 4th commit message:

set max-age for Strict-Transport-Security header to >180days, thx to
priority

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

# This is the 5th commit message:

Made tablesorter work without inline-js

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>

# This is the 2nd commit message:

fix  -> self in pFlush() in Settings-class, fixes #1464

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
test
# This is a combination of 4 commits.
# The first commit's message is:
asf

# This is the 2nd commit message:

explicitly set charset / collation of database when installing + new integrity-check-function to validate the database charset / collation and optionally fix it; fixes #1426

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

# This is the 3rd commit message:

add domain-bulk-import, fixes #1452

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

# This is the 4th commit message:

re-work findDirs()-function

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
Ok

Create etc_postfix_mysql-virtual_sender_permissions.cf

Create etc_postfix_mysql-virtual_alias_maps.cf

Create etc_postfix_mysql-virtual_sender_permissions.cf

Create etc_postfix_mysql-virtual_mailbox_domains.cf

Create etc_postfix_mysql-virtual_sender_permissions.cf

Create etc_postfix_mysql-virtual_sender_permissions.cf

Create etc_postfix_mysql-virtual_mailbox_domains.cf

Create etc_postfix_mysql-virtual_sender_permissions.cf

Create etc_postfix_mysql-virtual_alias_maps.cf

Create etc_postfix_mysql-virtual_sender_permissions.cf

Create etc_postfix_mysql-virtual_sender_permissions.cf

Delete etc_postfix_mysql-virtual_sender_permissions.cf

Create etc_postfix_mysql-virtual_sender_permissions.cf
Merge branch 'master' of https://github.com/junkpad92/Froxlor