Add Freebsd support

.travis.yml

@@ -28,7 +28,7 @@ install:
     - sed -e 's/username = guest/username = unittest/' -e 's/password = guest/password = gottatest/' nipap-cli/nipaprc > ~/.nipaprc
     - chmod 0600 ~/.nipaprc
     # install postgresql + ip4r + contrib
-    - sudo apt-get install -qq -y postgresql-9.1 postgresql-9.1-ip4r postgresql-contrib-9.1
+    - sudo apt-get install -qq -y postgresql-9.2 postgresql-9.2-ip4r postgresql-contrib-9.2
 
     # -- virtualenv build ------------------------------------------------------
     # install nipap dependencies
@@ -54,7 +54,7 @@ install:
     - if [ "$INSTALL" == "apt" ]; then wget -O - https://spritelink.github.io/NIPAP/nipap.gpg.key | sudo apt-key add -; fi
     - if [ "$INSTALL" == "apt" ]; then sudo apt-get update -qq; fi
     # install dependencies for installing & running nipap
-    - if [ "$INSTALL" == "apt" ]; then sudo apt-get install -qq -y --force-yes python-pysqlite2 python-psycopg2 python-ipy python3-ipy python-docutils postgresql-9.1 postgresql-9.1-ip4r python-tornado python-flask python-flask-xml-rpc python-flask-compress python-parsedatetime python-pylons python-tz python-dateutil python-psutil python-pyparsing; fi
+    - if [ "$INSTALL" == "apt" ]; then sudo apt-get install -qq -y --force-yes python-pysqlite2 python-psycopg2 python-ipy python3-ipy python-docutils postgresql-9.2 postgresql-9.2-ip4r python-tornado python-flask python-flask-xml-rpc python-flask-compress python-parsedatetime python-pylons python-tz python-dateutil python-psutil python-pyparsing; fi
     # if we are testing the upgrade, first install NIPAP packages from official repo
     - if [ "$INSTALL" == "apt" ] && [ "$UPGRADE" == "true" ]; then sudo apt-get install -qq nipapd nipap-www nipap-cli; fi
     # bump version so that we know we are upgrading beyond what is installed

NEWS

@@ -1,3 +1,17 @@
+Version 0.29.8 - Zeus
+---------------------
+ * Fix removal of extra attributes in web UI (#1205)
+ * Increased delay for automatic search in the web UI to 500 ms (#1208)
+ * Upgraded AngularJS and jQuery in the web UI (#1196)
+
+Version 0.29.7 - Zeus
+---------------------
+ * Add-prefix-from-prefix-option only shown when possible (#1111)
+ * Cache busting for static files in the web UI (#1120)
+ * Fix monitor attribute in web UI (#1131)
+ * Fix parsing of query string in URL (#1132)
+ * Various documentation fixes (#1124, #1153, #1155)
+
 Version 0.29.6 - Zeus
 ---------------------
  * Test scripts merged (#1059)

README.md

@@ -3,12 +3,10 @@ NIPAP
 
 [![Build Status](https://travis-ci.org/SpriteLink/NIPAP.svg?branch=master)](https://travis-ci.org/SpriteLink/NIPAP)
 [![Requirements Status](https://requires.io/github/SpriteLink/NIPAP/requirements.svg?branch=master)](https://requires.io/github/SpriteLink/NIPAP/requirements/?branch=master)
-[![Code Issues](https://www.quantifiedcode.com/api/v1/project/91a738c9570a4c5190a4b54d8e28188b/badge.svg)](https://www.quantifiedcode.com/app/project/91a738c9570a4c5190a4b54d8e28188b)
 [![Code Climate](https://codeclimate.com/github/SpriteLink/NIPAP/badges/gpa.svg)](https://codeclimate.com/github/SpriteLink/NIPAP)
-
 [![IRC Network](https://img.shields.io/badge/irc-%23NIPAP-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=nipap)
-
-pynipap: [![PyPI](https://img.shields.io/pypi/v/pynipap.svg)](https://pypi.python.org/pypi/pynipap/)
+[![PyPI](https://img.shields.io/pypi/v/pynipap.svg)](https://pypi.python.org/pypi/pynipap/)
+[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 NIPAP is a sleek, intuitive and powerful IP address management system built to
 efficiently handle large amounts of IP addresses.

docs/config-www.rst

@@ -10,7 +10,8 @@ backend and it should be a *trusted* account. Create it with the following::
 Obviously, replace "s3cr3t" with a better password and feel free to use
 whichever username you want, as long as you configure it accordingly. The user
 account for the web UI should not be used by any other user. Configure
-the web UI to use this account by configuring the xmlrpc_uri variable::
+the web UI to use this account by configuring the xmlrpc_uri variable in the
+www section of nipap.conf::
 
     xmlrpc_uri = http://nipap-www@local:[email protected]:1337
 

nipap-cli/debian/changelog

@@ -1,3 +1,21 @@
+nipap-cli (0.29.8-1) stable; urgency=medium
+
+  * Fix removal of extra attributes in web UI (#1205)
+  * Increased delay for automatic search in the web UI to 500 ms (#1208)
+  * Upgraded AngularJS and jQuery in the web UI (#1196)
+
+ -- Lukas Garberg <[email protected]>  Wed, 13 Mar 2019 01:03:38 +0100
+
+nipap-cli (0.29.7-1) stable; urgency=medium
+
+  * Add-prefix-from-prefix-option only shown when possible (#1111)
+  * Cache busting for static files in the web UI (#1120)
+  * Fix monitor attribute in web UI (#1131)
+  * Fix parsing of query string in URL (#1132)
+  * Various documentation fixes (#1124, #1153, #1155)
+
+ -- Lukas Garberg <[email protected]>  Thu, 31 May 2018 14:42:50 +0200
+
 nipap-cli (0.29.6-1) stable; urgency=medium
 
   * Test scripts merged (#1059)

nipap-cli/nipap_cli/__init__.py

@@ -1,4 +1,4 @@
-__version__     = "0.29.6"
+__version__     = "0.29.8"
 __author__      = "Kristian Larsson, Lukas Garberg"
 __author_email__ = "[email protected], [email protected]"
 __license__     = "MIT"

nipap-cli/setup.py

@@ -22,11 +22,18 @@ def get_data_files():
         print("rst2man failed to run:", str(exc), file=sys.stderr)
         sys.exit(1)
 
+    if sys.platform.startswith('freebsd'):
+        localbase = '/usr/local'
+        etcdir = localbase + '/etc'
+    else:
+        localbase = '/usr'
+        etcdir = '/etc'
+
     files = [
-            ('/etc/skel/', ['.nipaprc']),
-            ('/usr/bin/', ['helper-nipap', 'nipap']),
-            ('/usr/share/doc/nipap-cli/', ['bash_complete', 'nipaprc']),
-            ('/usr/share/man/man1/', ['nipap.1'])
+            (etcdir + '/skel/', ['.nipaprc']),
+            (localbase + '/bin/', ['helper-nipap', 'nipap']),
+            (localbase + '/share/doc/nipap-cli/', ['bash_complete', 'nipaprc']),
+            (localbase + '/share/man/man1/', ['nipap.1'])
         ]
 
     return files

nipap-www/debian/changelog

@@ -1,3 +1,21 @@
+nipap-www (0.29.8-1) stable; urgency=medium
+
+  * Fix removal of extra attributes in web UI (#1205)
+  * Increased delay for automatic search in the web UI to 500 ms (#1208)
+  * Upgraded AngularJS and jQuery in the web UI (#1196)
+
+ -- Lukas Garberg <[email protected]>  Wed, 13 Mar 2019 01:03:38 +0100
+
+nipap-www (0.29.7-1) stable; urgency=medium
+
+  * Add-prefix-from-prefix-option only shown when possible (#1111)
+  * Cache busting for static files in the web UI (#1120)
+  * Fix monitor attribute in web UI (#1131)
+  * Fix parsing of query string in URL (#1132)
+  * Various documentation fixes (#1124, #1153, #1155)
+
+ -- Lukas Garberg <[email protected]>  Thu, 31 May 2018 14:42:49 +0200
+
 nipap-www (0.29.6-1) stable; urgency=medium
 
   * Test scripts merged (#1059)

nipap-www/nipap_www.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: nipap-www
-Version: 0.29.6
+Version: 0.29.8
 Summary: web frontend for NIPAP
 Home-page: http://SpriteLink.github.com/NIPAP
 Author: Kristian Larsson, Lukas Garberg

nipap-www/nipapwww/__init__.py

@@ -1,4 +1,4 @@
-__version__     = "0.29.6"
+__version__     = "0.29.8"
 __author__      = "Kristian Larsson, Lukas Garberg"
 __author_email__ = "[email protected], [email protected]"
 __license__     = "MIT"