Merge lp:~jamesbeedy/charms/trusty/fiche/next into lp:~jamesbeedy/charms/trusty/fiche/trunk

[james beedy]

Updated README.

=== modified file 'README.md'
--- README.md	2016-01-12 22:40:14 +0000
+++ README.md	2016-03-07 18:01:08 +0000
@@ -11,10 +11,12 @@
 
     juju deploy fiche
 
-You can then use netcat to do things like 
+This will deploy fiche server to listen on port 9999 by default. 
+
+You can then use netcat to do things like
     
 ```bash
-cat file.txt | nc <ficheserver> <port>
+cat file.txt | nc <ficheserver> 9999
 ```
 
 # Configuration
@@ -22,7 +24,7 @@
 Once you have deployed fiche you can add an alias to your .bashrc to make fiche slightly more usable:
 
 ```bash
-echo 'alias tb="nc <ficheserver> <port>"' >> .bashrc
+echo 'alias tb="nc <ficheserver> 9999"' >> .bashrc
 ```
 
 Then you can:

=== modified file 'tests/10-deploy'
--- tests/10-deploy	2016-03-01 20:54:29 +0000
+++ tests/10-deploy	2016-03-07 18:01:08 +0000
@@ -40,11 +40,10 @@
         cls.unit = cls.deployment.sentry.unit['fiche/0']
         cls.ipaddr = cls.unit.info['public-address']
 
-
     def test_1_verify_netcat(self):
         nc_resp = netcat(self.ipaddr, 9999, "test-txt")
         nc_addr = str(nc_resp, "UTF-8").strip('\n')
-             
+
         response = requests.get(nc_addr)
         # Check for 500
         response.raise_for_status()
@@ -59,6 +58,5 @@
             amulet.raise_status(amulet.FAIL, msg=message)
 
 
-
 if __name__ == '__main__':
     unittest.main()