From 443df9b54ba0183cc44e561ec4c856ac6ebb8da1 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Thu, 15 Dec 2016 18:43:38 +0000
Subject: [PATCH] tweaks for upgrading phab in production

---
 inventory/group_vars/qa-prod              |  7 ------
 inventory/group_vars/qa-stg               |  7 ------
 roles/phabricator/tasks/main.yml          | 30 +----------------------
 roles/phabricator/templates/local.json.j2 |  5 ----
 4 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/inventory/group_vars/qa-prod b/inventory/group_vars/qa-prod
index e179d1305b..b0bcf717be 100644
--- a/inventory/group_vars/qa-prod
+++ b/inventory/group_vars/qa-prod
@@ -18,13 +18,6 @@ sshd_config: ssh/sshd_config.qa-prod
 sshd_port: 222
 external_hostname: qa.fedoraproject.org
 
-# not needed with new setup
-#sslcertfile: qa-stg.qa.fedoraproject.org.cert
-#sslkeyfile: qa-stg.qa.fedoraproject.org.key
-sslcertfile: ''
-sslkeyfile: ''
-sslintermediatecertfile: ''
-
 
 ################################################################################
 # Buildbot Settings
diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa-stg
index 0d7c6a537c..fdf6322446 100644
--- a/inventory/group_vars/qa-stg
+++ b/inventory/group_vars/qa-stg
@@ -17,13 +17,6 @@ sshd_config: ssh/sshd_config.qa-stg
 sshd_port: 222
 external_hostname: qa.stg.fedoraproject.org
 
-# not needed with new setup
-#sslcertfile: qa-stg.qa.fedoraproject.org.cert
-#sslkeyfile: qa-stg.qa.fedoraproject.org.key
-sslcertfile: ''
-sslkeyfile: ''
-sslintermediatecertfile: ''
-
 mariadb_host: localhost
 mariadb_user: '{{ qa_stg_mariadb_user }}'
 mariadb_password: '{{ qa_stg_mariadb_password }}'
diff --git a/roles/phabricator/tasks/main.yml b/roles/phabricator/tasks/main.yml
index 0841ae2984..a02c4efd45 100644
--- a/roles/phabricator/tasks/main.yml
+++ b/roles/phabricator/tasks/main.yml
@@ -151,39 +151,11 @@
 - name: start and enable phabricator phd service
   service: name=phd enabled=yes state=started
 
-- name: Install the SSL cert
-  copy:
-      src: "{{ private}}/files/httpd/{{ sslcertfile }}"
-      dest: /etc/pki/tls/certs/{{ sslcertfile }}
-      owner: root
-      group: root
-      mode: 0600
-  when: deployment_type == 'qadevel-prod'
-
-- name: Install the SSL key
-  copy:
-      src: "{{ private}}/files/httpd/{{ sslkeyfile }}"
-      dest: /etc/pki/tls/private/{{ sslkeyfile }}
-      owner: root
-      group: root
-      mode: 0600
-  when: deployment_type == 'qadevel-prod'
-
-- name: Install the SSL intermediate cert
-  copy:
-      src: "{{ private}}/files/httpd/{{ sslintermediatecertfile }}"
-      dest: /etc/pki/tls/certs/{{ sslintermediatecertfile }}
-      owner: root
-      group: root
-      mode: 0600
-  when: sslintermediatecertfile != '' and deployment_type == 'qadevel-prod'
-
 - name: clone phabricator-extension-ipsilonoauth
   git:
       repo: 'https://pagure.io/phabricator-extension-ipsilonoauth.git'
       dest: /srv/phabricator-extension-ipsilonoauth
-      version: bb099b7da76b9d9d87ef53d20ec0e0238da7a3bb
-  when: deployment_type == 'qa-stg'
+      version: c70333b0d2d4d348b429e82e39d634071accf939
 
 - name: copy phabricator httpd config
   template: src=phabricator.conf.j2 dest=/etc/httpd/conf.d/phabricator.conf owner=root group=root mode=0644
diff --git a/roles/phabricator/templates/local.json.j2 b/roles/phabricator/templates/local.json.j2
index d32464217f..fd190a7b83 100644
--- a/roles/phabricator/templates/local.json.j2
+++ b/roles/phabricator/templates/local.json.j2
@@ -32,13 +32,8 @@
         "PhabricatorApplicationOAuthServer" : true,
         "PhabricatorApplicationPhortune" : true
         },
-{% if deployment_type == "qa-stg" %}
   "load-libraries": {
     "ipsilonoauth": "/srv/phabricator-extension-ipsilonoauth/src"
   }
-{% else %}
-  "load-libraries"       : [],
-  "auth.email-domains" : ["fedoraproject.org"]
-{% endif %}
 }