Move the 0_pagure.conf apache configuration file from a file to a template

This commit is contained in:
Pierre-Yves Chibon 2015-07-20 11:37:38 +02:00
parent cf582b5c3e
commit 4cc45d279c
2 changed files with 7 additions and 3 deletions

View file

@ -209,9 +209,8 @@
- pagure - pagure
- name: Install the configuration file to activate https - name: Install the configuration file to activate https
copy: > template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }}
src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=0644
owner=root group=root mode=0644
with_items: with_items:
- 0_pagure.conf - 0_pagure.conf
tags: tags:

View file

@ -1,6 +1,11 @@
<VirtualHost *:80> <VirtualHost *:80>
{% if env == 'pagure-staging' %}
ServerName stg.pagure.io
Redirect permanent / https://stg.pagure.io/
{% else %}
ServerName pagure.io ServerName pagure.io
Redirect permanent / https://pagure.io/ Redirect permanent / https://pagure.io/
{% endif %}
</VirtualHost> </VirtualHost>
<VirtualHost *:443> <VirtualHost *:443>