From 4cc45d279c9788b3f50c7b372ec7bb19f6f55446 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mon, 20 Jul 2015 11:37:38 +0200 Subject: [PATCH] Move the 0_pagure.conf apache configuration file from a file to a template --- roles/pagure/frontend/tasks/main.yml | 5 ++--- roles/pagure/frontend/{files => templates}/0_pagure.conf | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) rename roles/pagure/frontend/{files => templates}/0_pagure.conf (87%) diff --git a/roles/pagure/frontend/tasks/main.yml b/roles/pagure/frontend/tasks/main.yml index 3831df9c2d..f1f7e33a4d 100644 --- a/roles/pagure/frontend/tasks/main.yml +++ b/roles/pagure/frontend/tasks/main.yml @@ -209,9 +209,8 @@ - pagure - name: Install the configuration file to activate https - copy: > - src={{ item }} dest=/etc/httpd/conf.d/{{ item }} - owner=root group=root mode=0644 + template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} + owner=root group=root mode=0644 with_items: - 0_pagure.conf tags: diff --git a/roles/pagure/frontend/files/0_pagure.conf b/roles/pagure/frontend/templates/0_pagure.conf similarity index 87% rename from roles/pagure/frontend/files/0_pagure.conf rename to roles/pagure/frontend/templates/0_pagure.conf index 39df8f9892..df3ea88be6 100644 --- a/roles/pagure/frontend/files/0_pagure.conf +++ b/roles/pagure/frontend/templates/0_pagure.conf @@ -1,6 +1,11 @@ + {% if env == 'pagure-staging' %} + ServerName stg.pagure.io + Redirect permanent / https://stg.pagure.io/ + {% else %} ServerName pagure.io Redirect permanent / https://pagure.io/ + {% endif %}