Merge branch 'master' of localhost:/srv/git/ansible

hosts

@@ -1,112 +1,74 @@
-sdwcltm2	ansible_host=192.168.50.2	site_clli=CRHMNJAW
+# list all of the raspberry PI devices in the network
-sdwcltm3	ansible_host=192.168.201.55	site_clli=MTLRNJIK
+# the host name on each will be set to the first column
-sdwcltm5	ansible_host=192.168.35.1	site_clli=PHLJPAMT
+# it can be 1-20 characters, letters, digits, and hyphens
-sdwsrvm		ansible_host=192.168.60.2	site_clli=WLGRPABW
+wes-host1 ansible_host=127.0.0.1
-sdwcltm8 	ansible_host=192.168.150.2	site_clli=FTCLCORN
+#wes-host2 ansible_host=192.168.88.240
-ubuntu-server-2	ansible_host=192.168.198.2	site_clli=CMCYCOJL
+#wes-host3 ansible_host=192.168.88.218
-sdwcltm7	ansible_host=192.168.199.2	site_clli=SRSPNYGN
+
-sdwsrvl		ansible_host=192.168.90.2	site_clli=LSBGFL59
+[ansible-hosts]
-sdwcltm4	ansible_host=192.168.100.2	site_clli=PROVUTZZ
+# there must only be one ansible-host.  this is the device
-sdwcltm6	ansible_host=192.168.200.34	site_clli=PHLJPAMT
+# that will act as the configuration server
-ubuntu-server-1	ansible_host=192.168.201.2	site_clli=MTLRNJIK
+wes-host1
-sdwcltm9	ansible_host=192.168.200.163 	site_clli=NRCRGAQN
-#192.168.201.3
-ipsectest1	ansible_host=192.168.201.90
-ssh-jump	ansible_host=192.168.201.9
 
 [pi]
-sdwcltm2
+# include all Raspberry Pi devces here
-sdwcltm3
+wes-host1
-sdwcltm5
+
-sdwsrvm
+#wes-host2
-sdwcltm8
+#wes-host3
-sdwcltm6
+
-sdwcltm7
+# use variables for passwords
-sdwsrvl
+# currently not implemented
-sdwcltm4
+[pi:vars]
-#192.168.201.3
+vncpassword=vncpass99
+pipassword=pipassword99
 
 [samba-server]
-ipsectest1
+# it is best to have only one samba-server host
+wes-host1
 
 [smbclient]
-sdwcltm2
+# it would probably be best to limit this to 10 clients
-sdwcltm3
+#wes-host2
-ubuntu-server-1
+#wes-host3
-sdwcltm5
-sdwsrvm
-sdwcltm8
-sdwcltm6
-sdwcltm7
-sdwsrvl
-sdwcltm4
-sdwcltm9
 
 [public]
-ubuntu-server-1
+# not currently used
-
+#
 [snmpd]
-#192.168.201.3
+# installs SNMP daemon
-sdwcltm2
+#
-sdwcltm3
+wes-host1
-sdwcltm6
-sdwcltm8
 
 [netflows]
-sdwcltm2
+# installs flow client
-sdwcltm3
+#
-sdwcltm5
-sdwcltm6
-sdwcltm7
-sdwcltm4
-sdwcltm8
-sdwcltm9
-sdwsrvm
-sdwsrvl
-ubuntu-server-1
-ubuntu-server-2
-
 [facebook]
-sdwcltm5
+# devices can be set up for facebook, salesforce or youtube
-sdwsrvm
+# these are mutually exclusive and must be checked by you as there
-sdwcltm4
+# is no automated process for that
+wes-host1
 
 [salesforce]
-sdwcltm3
+# see comment for facebook
-sdwcltm6
+#wes-host2
-sdwcltm7
-sdwsrvl
-sdwcltm8
 
 [youtube]
-sdwcltm2
+# see comment for facebook
-sdwcltm3
+#wes-host3
 
 [ftpclient]
-sdwcltm2
-sdwcltm3
-sdwcltm4
-sdwcltm5
-sdwcltm6
-sdwcltm7
-sdwcltm8
-sdwsrvm
-ubuntu-server-1
 
 [sipclient]
-sdwcltm2
+# generates VoIP traffic, signaling and media
-sdwcltm3
+wes-host1
-sdwcltm4
+#wes-host3
-sdwcltm5
-sdwcltm6
-sdwcltm7
-sdwcltm8
-sdwcltm9
-sdwsrvl
-sdwsrvm
 
 [sipserver]
-ubuntu-server-2
+# there must only be one sipserver
+#wes-host2
+wes-host1
 
 [ntopng]
-sdwcltm6
+# hosts running ntop
+wes-host1

roles/ntopng/tasks/main.yaml

@@ -24,6 +24,7 @@
           chdir: "{{ ansible_user_dir }}/ntopng"
 - name: install
   become: yes
+<<<<<<< HEAD
   command: "make install"
   args:
           chdir: "{{ ansible_user_dir }}/ntopng"