Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fixing the correct variables, returning to underscore in var name

Browse source
This commit is contained in:
Tim Flink 2015-02-02 06:30:36 +00:00
parent 5d48d0b4e2
commit 7448986cd5
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/qadevel-stg
View file

@ -20,7 +20,7 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me
--network=bridge=br0,model=virtio --autostart --noautoconsole --network=bridge=br0,model=virtio --autostart --noautoconsole
sshd_config: ssh/sshd_config.qadevel sshd_config: ssh/sshd_config.qadevel
externalhostname: qadevel-stg.qa.fedoraproject.org external_hostname: qadevel-stg.qa.fedoraproject.org
mariadb_host: db-qa01.qa.fedoraproject.org mariadb_host: db-qa01.qa.fedoraproject.org
mariadb_user: '{{ qadevel_stg_mariadb_user }}' mariadb_user: '{{ qadevel_stg_mariadb_user }}'

4
roles/phabricator/templates/phabricator.conf.j2
View file

@ -2,7 +2,7 @@ NameVirtualHost *:443
<VirtualHost *:443> <VirtualHost *:443>
# Change this to the domain which points to your host. # Change this to the domain which points to your host.
ServerName phab.{{hostname}} ServerName phab.{{external_hostname}}
# Use separate log files for the SSL virtual host; note that LogLevel # Use separate log files for the SSL virtual host; note that LogLevel
# is not inherited from httpd.conf. # is not inherited from httpd.conf.
@ -72,7 +72,7 @@ NameVirtualHost *:443
<VirtualHost *:80> <VirtualHost *:80>
# Change this to the domain which points to your host. # Change this to the domain which points to your host.
ServerName phab.{{hostname}} ServerName phab.{{external_hostname}}
RewriteEngine on RewriteEngine on
RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]

6
roles/phabricator/templates/qadevelconfig.conf.php.j2
View file

@ -14,9 +14,9 @@ return array(
'diffusion.ssh-user' => '{{ phabricator_vcs_user }}', 'diffusion.ssh-user' => '{{ phabricator_vcs_user }}',
'welcome.html' => '{{ lookup("file", "phabricator-welcome.html") }}', 'welcome.html' => '{{ lookup("file", "phabricator-welcome.html") }}',
'ui.header-color' => '{{ phabricator_header_color }}', 'ui.header-color' => '{{ phabricator_header_color }}',
'metamta.default-address' => 'phab@{{ externalhostname }}', 'metamta.default-address' => 'phab@{{ external_hostname }}',
'metamta.domain' => '{{ externalhostname }}', 'metamta.domain' => '{{ external_hostname }}',
'metamta.reply-handler-domain' => '{{ externalhostname }}', 'metamta.reply-handler-domain' => '{{ external_hostname }}',
'metamta.mail-adapter' => '{{ 'PhabricatorMailImplementationPHPMailerLiteAdapter' if phabricator_mail_enabled else 'PhabricatorMailImplementationTestAdapter'}}', 'metamta.mail-adapter' => '{{ 'PhabricatorMailImplementationPHPMailerLiteAdapter' if phabricator_mail_enabled else 'PhabricatorMailImplementationTestAdapter'}}',
'phabricator.uninstalled-applications' => array( 'phabricator.uninstalled-applications' => array(
'PhabricatorApplicationPhame' => true, 'PhabricatorApplicationPhame' => true,