Skip to content

Commit

Permalink
Merge branch 'master' into v7
Browse files Browse the repository at this point in the history
  • Loading branch information
gsanchietti committed Jun 1, 2017
2 parents 02be126 + 3972aea commit 1143bdc
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 105 deletions.
30 changes: 27 additions & 3 deletions administrator-manual/en/web_proxy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,34 @@ from specific IP or destined to some sites it's not routed through the HTTP/HTTP

The proxy allows you to create:

* bypass by source, configurable from :guilabel:`Hosts without proxy` section
* bypass by destination, configurable from :guilabel:`Sites without proxy` section
* bypass by domains
* bypass by source
* bypass by destination

Bypass rules are also configured inside the WPAD file.
Bypass by domains
-----------------

Bypass by domains can be configured from :guilabel:`Domains without proxy` section.
All domains listed inside this page can be directly accessed from LAN clients.
No antivirus or content filtering is applied to these domains.

Every domain listed will be expanded also for its own sub-domains.
For example, adding *nethserver.org* will bypass also *www.nethserver.org*, *mirror.nethserver.org*, etc.

.. note:: All LAN clients must use the server itself as DNS, either directly or as a forwarder.

Bypass by source and destinations
---------------------------------

A source bypass allows direct access to any HTTP/HTTPS sites from
selected hosts, host groups, IP ranges and network CIDR.
Source bypasses are configurable from :guilabel:`Hosts without proxy` section.

A destination bypass allows direct access from any LAN clients to HTTP/HTTPS sites hosted on specific hosts,
host groups or network CIDR.
Destination bypasses are configurable from :guilabel:`Sites without proxy` section.

These bypass rules are also configured inside the WPAD file.

Report
======
Expand Down
27 changes: 0 additions & 27 deletions developer-manual/en/c-icap.rst

This file was deleted.

11 changes: 0 additions & 11 deletions developer-manual/en/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ Developer Manual
certificate_management
yum_plugin
backup
gateway
ips

.. toctree::
:maxdepth: 2
Expand Down Expand Up @@ -70,31 +68,22 @@ Developer Manual
ftp
ups
tftp
pop3_proxy
owncloud
roundcube
collectd
phone_home
web_proxy
web_antivirus
content_filter
webvirtmgr
duc
snmp
tomcat7
postgresql
unixodbc
vpn
unbound
ntopng
samba_audit
redis
memcached
smartd
cups
antivirus
c-icap
iaxmodem
mysql

.. toctree::
Expand Down
2 changes: 2 additions & 0 deletions developer-manual/en/modules
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ nethserver-suricata
nethserver-webtop5
nethserver-ipsec-tunnels
nethserver-openvpn
nethserver-roundcubemail
nethserver-unbound
2 changes: 1 addition & 1 deletion developer-manual/en/nethserver-nextcloud.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ When using ``occ`` command, PHP 5.6 should be enabled inside the environment.

Invocation example: ::

su - apache -s /bin/bash -c "source /opt/rh/rh-php56/enable; cd /usr/share/nextcloud/; php occ " ldap:show-config
su - apache -s /bin/bash -c "source /opt/rh/rh-php56/enable; cd /usr/share/nextcloud/; php occ ldap:show-config"
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
====================
Webmail (Roundcube)
====================
========================
nethserver-roundcubemail
========================

Roundcube is a fast webmail client written in PHP.

Package: *nethserver-roundcubemail*.

Database
========

Expand All @@ -15,10 +13,10 @@ Available properites:

* ``Server``: server address of the mail server, default is ``localhost``
* ``access``: can be ``public`` or ``private``, default is ``public``

* *public*: webmail can be accessed from any networks
* *private*: webmail can be accessed only from green interfaces and trusted networks
* ``PluginsList``: comma separated list of enabled plugins, default is ``managesieve,markasjunk``.
* ``PluginsList``: comma separated list of enabled plugins, default is ``managesieve,markasjunk``.
Before adding an option to this property, please be sure the plugin is already installed.
A list of bundled plugins can be found inside file:``/usr/share/roundcubemail/plugins`` directory.

Expand All @@ -31,3 +29,4 @@ Example: ::


Configuration can be applied using the ``nethserver-roundcubemail-update`` event.

27 changes: 27 additions & 0 deletions developer-manual/en/nethserver-squid.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ All properties are saved in the ``squid`` key under the ``configuration`` databa
Properties:

* *BlueMode*: change Squid operation mode on blue networks. It has same values and defaults of ``GreenMode``
* *BypassDomains*: comma separeted list of domains bypassed when the proxy is set in transparent mode
* *DiskCache*: disabled by default, if enabled it actives the disk caching system for squid
* *DiskCacheSize*: maximum value of squid cache on disk
* *GreenMode*: change Squid operation mode on green networks.
Expand Down Expand Up @@ -89,6 +90,15 @@ Authentication schema depends on system configuration:
Bypasses
========

The implementation supports 3 kind of bypass:

- source bypass
- destination bypass
- domains bypass

Source and destination bypass
-----------------------------

Bypass rules are saved inside the ``fwrules`` databases.
A bypass can be of two types:

Expand All @@ -108,8 +118,25 @@ Bypass example: ::
Host=host;bosspc
status=enabled

Domains bypass
---------------

All requests to domains listed inside the ``BypassDomains`` property will not
be redirect to the transparent proxy.

The implementation uses the ipset feature of Dnsmasq.
Each time a listed domain is accessed from the client, Dnsmasq resolves the IP
and add it to ``squid-bypass`` ipset.
The ``squid-bypass`` ipset is then used as exception inside Shorewall REDIRECT rule.

Notes:

* all clients must use the server as DNS
* Dnsmasq name resolution works for the listed domains and all sub-domains

Cache
=====

There is an *event* called ``nethserver-squid-clear-cache`` that empties the cache.

WPAD
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
.. _unbound-section:

=======
Unbound
=======
===================
nethserver-unbonund
===================

Unbound is a validating, recursive, and caching DNS resolver.
Currently it's only used only as DNS server for anti-spam DNSBL implementation.
Expand All @@ -12,8 +10,8 @@ in well-known blacklists.
Some blacklists doesn't allow multiple query from public DNS servers,
thus the system needs a DNS server which can directly query the blacklist DNS.

If the mail filter is installed, dnsmasq configuration is changed, and specific
domain query are redirect trough unbond.
If the mail filter is installed, dnsmasq configuration is changed, and specific
domain query are redirect trough unbond.
See: :file:`/etc/e-smith/templates/etc/dnsmasq.conf/26unbound_rbl`.

Package: *nethserver-unbound*.
Expand All @@ -37,3 +35,4 @@ Example: ::
status=enabled

Configuration can be applied using the ``nethserver-unbound-update`` event.

49 changes: 0 additions & 49 deletions developer-manual/en/web_antivirus.rst

This file was deleted.

0 comments on commit 1143bdc

Please sign in to comment.