Merge pull request #2 from openwisp/master

Merge with base openwisp-config

CHANGELOG.rst

@@ -1,10 +1,19 @@
 Change log
 ^^^^^^^^^^
 
-0.4.0 [unreleased]
+0.4.0 [2016-06-23]
 ==================
 
-WIP
+- `#16 <https://github.com/openwisp/openwisp-config/issues/16>`_: added "Unmanaged Configurations" feature (replaced ``merge_default``)
+- `#19 <https://github.com/openwisp/openwisp-config/issues/19>`_: added smarter configuration merge mechanism
+- `#20 <https://github.com/openwisp/openwisp-config/issues/20>`_: improved default test
+- `#21 <https://github.com/openwisp/openwisp-config/issues/21>`_: introduced automatic naming of anonymous uci sections
+- `daff21f <https://github.com/openwisp/openwisp-config/commit/daff21f>`_: added "Consistent key generation" feature
+- `d6294ce <https://github.com/openwisp/openwisp-config/commit/d6294ce>`_: added ``capath`` argument and configuration option
+- `93639af <https://github.com/openwisp/openwisp-config/commit/93639af>`_: added ``connect_timeout`` and ``max_time`` options for curl
+- `9ef6f93 <https://github.com/openwisp/openwisp-config/commit/9ef6f93>`_: added support for LEDE
+- `e122e40 <https://github.com/openwisp/openwisp-config/commit/e122e40>`_: fixed bug in autoregistration when hostname is empty
+- `bd8ad3b <https://github.com/openwisp/openwisp-config/commit/bd8ad3b>`_: improved build options (ssl, category, maintainer)
 
 0.3.1 [2016-03-02]
 ==================

README.rst

@@ -8,7 +8,7 @@ openwisp-config
 
 ------------
 
-OpenWRT configuration agent for the new `OpenWISP <http://openwrt.org>`_ Controller
+OpenWRT/LEDE configuration agent for the new `OpenWISP <http://openwrt.org>`_ Controller
 (currently under development, will be based on `django-netjsonconfig <https://github.com/openwisp/django-netjsonconfig>`_).
 
 .. image:: http://netjsonconfig.openwisp.org/en/latest/_images/openwisp.org.svg
@@ -29,30 +29,27 @@ First run:
 
     opkg update
 
-For `ar71xx <https://wiki.openwrt.org/doc/hardware/soc/soc.qualcomm.ar71xx>`_:
+Then install one of the `latest builds <http://downloads.openwisp.org/openwisp-config/>`_:
 
 .. code-block:: shell
 
-    opkg install http://downloads.openwisp.org/openwisp-config/0.3.1/ar71xx/openwisp-config_0.3.1-1_ar71xx.ipk
+    opkg install <URL>
 
-For `rampis <https://wiki.openwrt.org/doc/hardware/soc/soc.mediatek>`_:
+Where ``<URL>`` is the URL of the image that is suitable for your case.
 
-.. code-block:: shell
-
-    opkg install http://downloads.openwisp.org/openwisp-config/0.3.1/ramips/openwisp-config_0.3.1-1_ramips_24kec.ipk
-
-For a list of the latest builds, take a look at `downloads.openwisp.org
+For a list of the latest built images, take a look at `downloads.openwisp.org
 <http://downloads.openwisp.org/openwisp-config/>`_.
 
-If you need a package for other SoCs you will need to compile the package, see
-`Compiling openwisp-config`_.
+If the SoC or OpenWRT version you are using is not available, you have to compile the package,
+(see `Compiling openwisp-config`_).
 
-Once installed, the package needs to be configured (see `Configuration options <#configuration-options>`_ section below)
-and started with::
+Once installed *openwisp-config* needs to be configured (see `Configuration options <#configuration-options>`_)
+and then started with::
 
     /etc/init.d/openwisp_config start
 
-To ensure the agent is working correctly find out how to debug in the `Debugging <#debugging>`_ section.
+To ensure the agent is working correctly find out how to perform debugging in
+the `Debugging <#debugging>`_ section.
 
 Configuration options
 ---------------------
@@ -241,6 +238,10 @@ You should see something like::
 
     3800 root      1200 S    {openwisp_config} /bin/sh /usr/sbin/openwisp_config --url https://openwisp2.mydomain.com --verify-ssl 1 --consistent-key 1 ...
 
+You can inspect the version of openwisp-config currently installed with::
+
+    openwisp_config --version
+
 Run tests
 ---------
 

VERSION

@@ -1 +1 @@
-0.4.0a
+0.4.0

openwisp-config/tests/test_remove_default_wifi.lua

@@ -8,7 +8,7 @@ TestRemoveDefaultWifi = {
         os.execute('cp ./wifi/wireless ./config')
     end,
     tearDown = function()
-        -- os.execute('rm ./config/wireless')
+        os.execute('rm ./config/wireless')
     end
 }