commit 7d7eabe3bfa8d78fd54f9716318ab8bd7db4c24e Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Thu Oct 27 19:51:03 2016 +0200 Remove fedora fas01 hack roles/fas_server/tasks/main.yml | 8 -------- roles/fas_server/templates/fas.cfg.j2 | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) --- diff --git a/roles/fas_server/tasks/main.yml b/roles/fas_server/tasks/main.yml index 2c8d470..ff5bc96 100644 --- a/roles/fas_server/tasks/main.yml +++ b/roles/fas_server/tasks/main.yml @@ -413,11 +413,3 @@ - fas - hotfixfas -- name: HOTFIX make sure only fas01 cleans up sessions - copy: src={{ roles }}/fas_server/files/controllers.py - dest=/usr/lib/python2.6/site-packages/fas/controllers.py - mode=644 owner=root group=root - tags: - - config - - fas - - hotfixfas diff --git a/roles/fas_server/templates/fas.cfg.j2 b/roles/fas_server/templates/fas.cfg.j2 index 3718f12..e1de606 100644 --- a/roles/fas_server/templates/fas.cfg.j2 +++ b/roles/fas_server/templates/fas.cfg.j2 @@ -251,9 +251,9 @@ gpgexec = "/usr/bin/gpg" gpghome = "/etc/fas-gpg" # Note: gpg_fingerprint and gpg_passphrase are for encrypting password reset mail if the user has # a gpg key registered. It's currently broken -gpg_fingerprint = "C199 1E25 D00A D200 2D2E 54D1 BF7F 1647 C54E 8410" -gpg_passphrase = "{{ fasGpgPassphrase }}" -gpg_keyserver = "hkp://subkeys.pgp.net" +gpg_fingerprint = "0FC4 A51E 379A C050 5112 8DF5 94D7 5B22 5B01 F801" +#gpg_passphrase = "{{ fasGpgPassphrase }}" +gpg_keyserver = "hkp://keys.fedoraproject.org" [/rpmfusion-server-ca.cert] static_filter.on = True