changing qa-stg to use stg proxies instead of self host

inventory/group_vars/qa-stg

@@ -15,11 +15,12 @@ extra_enablerepos: 'infrastructure-testing'
 
 sshd_config: ssh/sshd_config.qa-stg
 sshd_port: 222
-external_hostname: qadevel-stg.cloud.fedoraproject.org
+external_hostname: qa.stg.fedoraproject.org
 
-sslcertfile: qa-stg.qa.fedoraproject.org.cert
+# not needed with new setup
-sslkeyfile: qa-stg.qa.fedoraproject.org.key
+#sslcertfile: qa-stg.qa.fedoraproject.org.cert
-sslintermediatecertfile: ''
+#sslkeyfile: qa-stg.qa.fedoraproject.org.key
+#sslintermediatecertfile: ''
 
 mariadb_host: localhost
 mariadb_config: my.cnf.phabricator

roles/phabricator/tasks/main.yml

@@ -173,6 +173,7 @@
       owner: root
       group: root
       mode: 0600
+  when: deployment_type == 'qadevel-prod'
 
 - name: Install the SSL key
   copy:
@@ -181,6 +182,7 @@
       owner: root
       group: root
       mode: 0600
+  when: deployment_type == 'qadevel-prod'
 
 - name: Install the SSL intermediate cert
   copy:
@@ -189,7 +191,7 @@
       owner: root
       group: root
       mode: 0600
-  when: sslintermediatecertfile != ''
+  when: sslintermediatecertfile != '' and deployment_type == 'qadevel-prod'
 
 
 - name: copy phabricator httpd config

roles/phabricator/templates/local.json.j2

@@ -1,5 +1,6 @@
 {
   "phabricator.base-uri" : "https:\/\/phab.{{ external_hostname }}\/",
+  "phabricator.allowed-uris": ["http:\/\/phab.{{ inventory_hostname }}\/"],
   "log.ssh.path"  : "\/var\/log\/phabricator\/ssh.log",
   "log.access.path" : "\/var\/log\/phabricator\/access.log",
   "mysql.host" : "{{ mariadb_host }}",

roles/phabricator/templates/phabricator.conf.j2

@@ -1,3 +1,4 @@
+{% if  deployment_type == "qadevel-prod" %}
 <VirtualHost *:443>
   # Change this to the domain which points to your host.
   ServerName phab.{{external_hostname}}
@@ -75,7 +76,21 @@
   RewriteEngine on
   RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 </VirtualHost>
+{% if  deployment_type == "qadevel-prod" %}
+{% else %}
+<VirtualHost *:80>
+  # Change this to the domain which points to your host.
+  ServerName phab.{{external_hostname}}
 
+  # Make sure you include "/webroot" at the end!
+  DocumentRoot {{phabroot}}/phabricator/webroot
+
+  RewriteEngine on
+  RewriteRule ^/rsrc/(.*)     -                       [L,QSA]
+  RewriteRule ^/favicon.ico   -                       [L,QSA]
+  RewriteRule ^(.*)$          /index.php?__path__=$1  [B,L,QSA]
+</VirtualHost>
+{% endif %}
 
 <Directory "{{ phabroot }}/phabricator/webroot">
   AllowOverride None