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

move ssh on qadevel-stg back to a port that works, make git setup conditional

Browse source
This commit is contained in:
Tim Flink 2015-02-02 05:53:13 +00:00
parent 768a4f9f21
commit 21ab50a371
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/qadevel-stg
View file

@ -25,6 +25,7 @@ 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 }}'
mariadb_password: '{{ qadevel_stg_mariadb_password }}' mariadb_password: '{{ qadevel_stg_mariadb_password }}'
enable_phabricator_git: False
phabricator_db_name: phabricator-stg phabricator_db_name: phabricator-stg
phabricator_vcs_user: git phabricator_vcs_user: git
phabricator_daemon_user: phabdaemon phabricator_daemon_user: phabdaemon

2
inventory/inventory
View file

@ -11,7 +11,7 @@ beaker01.qa.fedoraproject.org
qadevel.qa.fedoraproject.org qadevel.qa.fedoraproject.org
[qadevel-stg] [qadevel-stg]
qadevel-stg.qa.fedoraproject.org ansible_ssh_port=222 qadevel-stg.qa.fedoraproject.org
[arm-packager] [arm-packager]
arm03-packager00.cloud.fedoraproject.org arm03-packager00.cloud.fedoraproject.org

2
roles/base/files/ssh/sshd_config.qadevel
View file

@ -14,7 +14,7 @@
# SELinux about this change. # SELinux about this change.
# semanage port -a -t ssh_port_t -p tcp #PORTNUMBER # semanage port -a -t ssh_port_t -p tcp #PORTNUMBER
# #
Port 222 Port 22
#AddressFamily any #AddressFamily any
#ListenAddress 0.0.0.0 #ListenAddress 0.0.0.0
#ListenAddress :: #ListenAddress ::

5
roles/phabricator/tasks/main.yml
View file

@ -46,6 +46,7 @@
- name: create git repo root for phabricator - name: create git repo root for phabricator
file: path={{ phabricator_repodir }} state=directory owner={{ phabricator_daemon_user }} group={{ phabricator_daemon_user }} mode=1755 file: path={{ phabricator_repodir }} state=directory owner={{ phabricator_daemon_user }} group={{ phabricator_daemon_user }} mode=1755
when: enable_phabricator_git
- name: create file directory for phabricator - name: create file directory for phabricator
file: path={{ phabricator_filedir }} state=directory owner=apache group=apache mode=1755 file: path={{ phabricator_filedir }} state=directory owner=apache group=apache mode=1755
@ -70,15 +71,19 @@
- name: generate phabricator git hook - name: generate phabricator git hook
template: src=phabricator-ssh-hook.sh.j2 dest=/etc/phabricator-ssh-hook.sh owner=root group=root mode=0755 template: src=phabricator-ssh-hook.sh.j2 dest=/etc/phabricator-ssh-hook.sh owner=root group=root mode=0755
when: enable_phabricator_git
- name: generate phabricator ssh config for vcs - name: generate phabricator ssh config for vcs
template: src=phabricator-sshd.conf.j2 dest=/etc/ssh/phabricator-sshd.conf owner=root group=root mode=0600 template: src=phabricator-sshd.conf.j2 dest=/etc/ssh/phabricator-sshd.conf owner=root group=root mode=0600
when: enable_phabricator_git
- name: generate phabricator ssh service file - name: generate phabricator ssh service file
template: src=phabricator-sshd.service.j2 dest=/lib/systemd/system/phabricator-sshd.service owner=root group=root mode=0644 template: src=phabricator-sshd.service.j2 dest=/lib/systemd/system/phabricator-sshd.service owner=root group=root mode=0644
when: enable_phabricator_git
- name: start and enable phabricator sshd service - name: start and enable phabricator sshd service
service: name=phabricator-sshd enabled=yes state=started service: name=phabricator-sshd enabled=yes state=started
when: enable_phabricator_git
- name: generate phabricator phd service file - name: generate phabricator phd service file
template: src=phd.service.j2 dest=/lib/systemd/system/phd.service owner=root group=root mode=0644 template: src=phd.service.j2 dest=/lib/systemd/system/phd.service owner=root group=root mode=0644