diff --git a/roles/datagrepper/files/fedmsg-hub b/roles/datagrepper/files/fedmsg-hub deleted file mode 100644 index e92b4c31dc..0000000000 --- a/roles/datagrepper/files/fedmsg-hub +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/python -# puppet/modules/datagrepper/templates/fedmsg-hub.erb -__requires__ = ['fedmsg', 'SQLAlchemy >= 0.7', 'jinja2 >= 2.4'] -import os -import sys -from pkg_resources import load_entry_point -os.environ['DATAGREPPER_CONFIG'] = '/etc/datagrepper/datagrepper.cfg' - -if __name__ == '__main__': - sys.exit( - load_entry_point('fedmsg', 'console_scripts', 'fedmsg-hub')() - ) diff --git a/roles/datagrepper/tasks/main.yml b/roles/datagrepper/tasks/main.yml index e66378c6cd..963d1f2e69 100644 --- a/roles/datagrepper/tasks/main.yml +++ b/roles/datagrepper/tasks/main.yml @@ -49,14 +49,6 @@ - config - datagrepper -#- name: adding fedmsg-hub binary -# file: src=fedmsg-hub dest=/usr/bin/fedmsg-hub owner=root group=root mode=755 -# notify: -# - restart fedmsg-hub -# tags: -# - config -# - datagrepper - - name: ensure selinux lets httpd talk to the database seboolean: name=httpd_can_network_connect_db persistent=yes state=yes tags: @@ -67,20 +59,5 @@ tags: - datagrepper -- name: check the selinux context of cache dir - command: matchpathcon /var/cache/datagrepper - register: cachedir - always_run: yes - changed_when: "1 != 1" - tags: - - config - - selinux - -- name: adding datagrepper dir in httpd context - command: semanage fcontext -a -t httpd_cache_t "/var/cache/datagrepper(/.*)?" - when: cachedir.stdout.find('httpd_cache_t') == -1 - tags: - - datagrepper - # selinux policy has been intentionally omitted since that is obtained from fedmsg/base