moved from p2p-test repo to ncsa/sdaiakeys

roles/transport/tasks/build.yml

+---
+
+# BEGIN TEST COMPILE SECTION
+# using static binaries, don't compile for now
+# install libzmq
+#- name: Creates libzmq directory
+#  file: path=/usr/local/src/libzmq state=directory
+#- git:
+#    repo: https://github.com/zeromq/libzmq.git 
+#    dest: /usr/local/src/libzmq
+#- name: autogen.sh libzmq
+#  command: ./autogen.sh
+#  args:
+#    chdir: "/usr/local/src/libzmq"
+#- name: configure libzmq
+#  command: ./configure
+#  args:
+#    chdir: "/usr/local/src/libzmq"
+#- name: make libzmq
+#  command: make
+#  args:
+#    chdir: "/usr/local/src/libzmq"
+#- name: make install libzmq
+#  command: make install
+#  args:
+#    chdir: "/usr/local/src/libzmq"
+#- name: run ldconfig
+#  command: ldconfig
+
+# install czmq
+#- name: czmq git hack part1, fixme
+#  command: rm -rf /usr/local/src/czmq.moved
+#- stat: path=/usr/local/src/czmq
+#  register: czmqsourcedir
+#- name: czmq git hack part2, fixme
+#  command: mv /usr/local/src/czmq /usr/local/src/czmq.moved
+#  when: czmqsourcedir.stat.exists == True
+#- name: Creates czmq directory
+#  file: path=/usr/local/src/czmq state=directory
+#- name: git czmq
+#  git:
+#    repo: git://github.com/wesyoung/czmq.git
+#    version: feat/curve
+#    force: yes
+#    dest: /usr/local/src/czmq
+#- name: czmq git add upstream
+#  command: git remote add upstream git://github.com/zeromq/czmq.git
+#  args:
+#    chdir: "/usr/local/src/czmq"
+#- name: czmq git fetch
+#  command: git fetch
+#  args:
+#    chdir: "/usr/local/src/czmq"
+#- name: czmq git add upstream
+#  command: git pull --no-commit upstream master
+#  args:
+#    chdir: "/usr/local/src/czmq"
+#- name: autogen.sh czmq
+#  command: ./autogen.sh
+#  args:
+#    chdir: "/usr/local/src/czmq"
+#- name: configure czmq
+#  command: ./configure
+#  args:
+#    chdir: "/usr/local/src/czmq"
+#- name: make czmq
+#  command: make
+#  args:
+#    chdir: "/usr/local/src/czmq"
+#- name: make install czmq
+#  command: make install
+#  args:
+#    chdir: "/usr/local/src/czmq"
+#- name: run ldconfig
+#  command: ldconfig
+#
+## install zyre
+#- name: Creates zyre directory
+#  file: path=/usr/local/src/zyre state=directory
+#- git:
+#    repo: git://github.com/JustinAzoff/zyre.git
+#    version: curve_merges
+#    dest: /usr/local/src/zyre
+#- name: autogen.sh zyre
+#  command: ./autogen.sh
+#  args:
+#    chdir: "/usr/local/src/zyre"
+#- name: configure zyre
+#  command: ./configure
+#  args:
+#    chdir: "/usr/local/src/zyre"
+#- name: make
+#  command: make
+#  args:
+#    chdir: "/usr/local/src/zyre"
+#- name: make install zyre
+#  command: make install
+#  args:
+#    chdir: "/usr/local/src/zyre"
+#- name: run ldconfig
+#  command: ldconfig
+#
+## install gateway
+#- name: Create gateway directory
+#  file: path=/usr/local/gateway state=directory
+#- git:
+#    repo: git://github.com/JustinAzoff/simpledisco.git
+#    dest: /usr/local/gateway
+#- name: make gateway step 1
+#  command: make
+#  args:
+#    chdir: "/usr/local/gateway"
+#- name: make gateway step 2
+#  command: make -f Makefile.gateway gateway.static
+#  args:
+#    chdir: "/usr/local/gateway"
+# END TEST COMPILE SECTION

roles/transport/tasks/main.yml

@@ -10,7 +10,6 @@
 - name: systemd env file
   template: src=zyre_gateway.env.j2 dest=/etc/zyre_gateway.env mode=0660 owner="{{ app_user }}" group="{{ app_user }}" mode=644
 
-
 - include: firewall.yml
   tags: firewall
 

roles/transport/tasks/zyregw.yml

@@ -13,129 +13,9 @@
 - name: rename gateway dir
   command: mv /usr/local/gateway.s /usr/local/gateway
 
-# using static binaries, don't compile for now
-# install libzmq
-#- name: Creates libzmq directory
-#  file: path=/usr/local/src/libzmq state=directory
-#- git:
-#    repo: https://github.com/zeromq/libzmq.git 
-#    dest: /usr/local/src/libzmq
-#- name: autogen.sh libzmq
-#  command: ./autogen.sh
-#  args:
-#    chdir: "/usr/local/src/libzmq"
-#- name: configure libzmq
-#  command: ./configure
-#  args:
-#    chdir: "/usr/local/src/libzmq"
-#- name: make libzmq
-#  command: make
-#  args:
-#    chdir: "/usr/local/src/libzmq"
-#- name: make install libzmq
-#  command: make install
-#  args:
-#    chdir: "/usr/local/src/libzmq"
-#- name: run ldconfig
-#  command: ldconfig
-
-# install czmq
-#- name: czmq git hack part1, fixme
-#  command: rm -rf /usr/local/src/czmq.moved
-#- stat: path=/usr/local/src/czmq
-#  register: czmqsourcedir
-#- name: czmq git hack part2, fixme
-#  command: mv /usr/local/src/czmq /usr/local/src/czmq.moved
-#  when: czmqsourcedir.stat.exists == True
-#- name: Creates czmq directory
-#  file: path=/usr/local/src/czmq state=directory
-#- name: git czmq
-#  git:
-#    repo: git://github.com/wesyoung/czmq.git
-#    version: feat/curve
-#    force: yes
-#    dest: /usr/local/src/czmq
-#- name: czmq git add upstream
-#  command: git remote add upstream git://github.com/zeromq/czmq.git
-#  args:
-#    chdir: "/usr/local/src/czmq"
-#- name: czmq git fetch
-#  command: git fetch
-#  args:
-#    chdir: "/usr/local/src/czmq"
-#- name: czmq git add upstream
-#  command: git pull --no-commit upstream master
-#  args:
-#    chdir: "/usr/local/src/czmq"
-#- name: autogen.sh czmq
-#  command: ./autogen.sh
-#  args:
-#    chdir: "/usr/local/src/czmq"
-#- name: configure czmq
-#  command: ./configure
-#  args:
-#    chdir: "/usr/local/src/czmq"
-#- name: make czmq
-#  command: make
-#  args:
-#    chdir: "/usr/local/src/czmq"
-#- name: make install czmq
-#  command: make install
-#  args:
-#    chdir: "/usr/local/src/czmq"
-#- name: run ldconfig
-#  command: ldconfig
-#
-## install zyre
-#- name: Creates zyre directory
-#  file: path=/usr/local/src/zyre state=directory
-#- git:
-#    repo: git://github.com/JustinAzoff/zyre.git
-#    version: curve_merges
-#    dest: /usr/local/src/zyre
-#- name: autogen.sh zyre
-#  command: ./autogen.sh
-#  args:
-#    chdir: "/usr/local/src/zyre"
-#- name: configure zyre
-#  command: ./configure
-#  args:
-#    chdir: "/usr/local/src/zyre"
-#- name: make
-#  command: make
-#  args:
-#    chdir: "/usr/local/src/zyre"
-#- name: make install zyre
-#  command: make install
-#  args:
-#    chdir: "/usr/local/src/zyre"
-#- name: run ldconfig
-#  command: ldconfig
-#
-## install gateway
-#- name: Create gateway directory
-#  file: path=/usr/local/gateway state=directory
-#- git:
-#    repo: git://github.com/JustinAzoff/simpledisco.git
-#    dest: /usr/local/gateway
-#- name: make gateway step 1
-#  command: make
-#  args:
-#    chdir: "/usr/local/gateway"
-#- name: make gateway step 2
-#  command: make -f Makefile.gateway gateway.static
-#  args:
-#    chdir: "/usr/local/gateway"
-
 - name: Create gateway public keys directory
   file: path=/usr/local/gateway/public_keys state=directory
 
-# we are relying on pub keys in p2p-test repo
-#- name: gateway discovery key
-#  template: src=discovery.key.j2 dest=/usr/local/gateway/public_keys/discovery.key owner={{ app_user }} group={{ app_user }} mode=0644
-#- name: alt gateway discovery key
-#  template: src=kurn.key.j2 dest=/usr/local/gateway/public_keys/kurn.key owner={{ app_user }} group={{ app_user }} mode=0644
-
 - name: generate gateway keys
   command: /usr/local/gateway/gateway keygen
   args:
@@ -144,15 +24,15 @@
 - name: Ensure gateway directory is owned by app_user
   command: find /usr/local/gateway -exec chown {{ app_user }}.{{ app_user}} {} \;
 
-- name: Create p2p-test directory
-  file: path=/usr/local/p2p-test state=directory
+- name: Create sdaiakeys directory
+  file: path=/usr/local/sdaiakeys state=directory
 - git:
-    repo: https://github.com/JustinAzoff/p2p-test
-    dest: /usr/local/p2p-test
+    repo: https://github.com/ncsa/sdaiakeys
+    dest: /usr/local/sdaiakeys
 
 - copy: src={{ item }} dest=/usr/local/gateway/public_keys
   with_fileglob:
-    - /usr/local/p2p-test/public_keys/*
+    - /usr/local/sdaiakeys/public_keys/*
 
 - name: systemd services
   template: src=zyre-gateway.service.j2 dest=/etc/systemd/system/zyre-gateway.service owner=root group=root mode=0644