Merge pull request #1078 from proditis/master

playbook updates for connection=local

ansible/runonce/db.yml

@@ -75,7 +75,7 @@
       - { name: check_quotas, state: "disable" }
       - { name: cron, state: "disable" }
       - { name: resolved, state: "disable" }
-      - { name: dhcpleased, state: "disable" }
+      #- { name: dhcpleased, state: "disable" }
       - { name: ntpd, state: "enable" }
       - { name: pflogd, state: "disable" }
       - { name: slaacd, state: "disable" }

ansible/runonce/mui.yml

@@ -4,35 +4,27 @@
   gather_facts: false
   vars_prompt:
     - name: "myname"
-      prompt: "1/8. System hostname?"
+      prompt: "1/6. System hostname?"
       default: "mui.example.local"
       private: no
     - name: "mui_ext_ip"
-      prompt: "2/8. What is the external (public) IP?"
+      prompt: "2/6. What is the external (public) IP?"
       default: "1.2.3.4"
       private: no
     - name: "db_ip"
-      prompt: "3/8. What is the database server IP?"
+      prompt: "3/6. What is the database server IP?"
       default: "10.7.0.253"
       private: no
-    - name: "GITHUB_OAUTH_TOKEN"
-      prompt: "4/8. Provide a github oauth token?"
-      default: ""
-      private: no
-    - name: "GITHUB_REPO"
-      prompt: "5/8. Provide a github repo to clone?"
-      default: "{{ lookup('pipe', 'git remote get-url origin') }}"
-      private: no
     - name: "domain_name"
-      prompt: "6/8. Provide the fqdn the backend will run on?"
+      prompt: "4/6. Provide the fqdn the backend will run on?"
       default: "mui.example.com"
       private: no
     - name: "interconnect_interface"
-      prompt: "7/8. What is the interconnect interface to be used?"
+      prompt: "5/6. What is the interconnect interface to be used?"
       default: "em1"
       private: no
     - name: "mui_ip"
-      prompt: "8/8. What is the interconnect IP to be used?"
+      prompt: "6/6. What is the interconnect IP to be used?"
       default: "10.7.0.201"
       private: no
 
@@ -217,6 +209,7 @@
     with_items: "{{rcctl}}"
 
   - name: Clone echoCTF repo
+    when: GITHUB_REPO is defined
     git:
       repo: '{{GITHUB_REPO}}'
       dest: "/home/moderatorUI/{{domain_name}}"

ansible/templates/pf.conf.j2

@@ -12,6 +12,7 @@ set timeout { tcp.closed 30, tcp.closing 300, tcp.finwait 15, tcp.first 60, tcp.
 table <administrators> persist counters file "/etc/administrators.conf"
 table <maintenance> persist counters file "/etc/maintenance.conf"
 table <moderators> persist counters file "/etc/moderators.conf"
+table <service_clients> persist counters file "/etc/service_clients.conf"
 table <docker_clients> persist counters file "/etc/docker_clients.conf"
 table <docker_servers> persist counters file "/etc/docker_servers.conf"
 table <registry_clients> persist counters file "/etc/registry_clients.conf"