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

add logic for fedora mediawiki, reinstall staging as f24

Browse source
This commit is contained in:
Kevin Fenzi 2016-09-12 22:38:55 +00:00
parent 571e95ef5c
commit 0691babe41
5 changed files with 50 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/wiki
View file

@ -15,6 +15,7 @@ fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran
wikiname: "fp" wikiname: "fp"
wikipath: "wiki" wikipath: "wiki"
wpath: "w" wpath: "w"
wikiver: "mediawiki119"
# These are consumed by a task in roles/fedmsg/base/main.yml # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

5
inventory/group_vars/wiki-stg
View file

@ -4,9 +4,7 @@ lvm_size: 30000
mem_size: 2048 mem_size: 2048
num_cpus: 2 num_cpus: 2
# for systems that do not match the above - specify the same parameter in virt_install_command: "{{ virt_install_command_two_nic }}"
# the host_vars/$hostname file
virt_install_command: "{{ virt_install_command_rhel6 }}"
tcp_ports: [ 80 ] tcp_ports: [ 80 ]
fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran
@ -15,6 +13,7 @@ fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran
wikiname: "fp" wikiname: "fp"
wikipath: "wiki" wikipath: "wiki"
wpath: "w" wpath: "w"
wikiver: "mediawiki"
# These are consumed by a task in roles/fedmsg/base/main.yml # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

4
inventory/host_vars/wiki01.stg.phx2.fedoraproject.org
View file

@ -2,8 +2,8 @@
nm: 255.255.255.0 nm: 255.255.255.0
gw: 10.5.126.254 gw: 10.5.126.254
dns: 10.5.126.21 dns: 10.5.126.21
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
eth0_ip: 10.5.126.60 eth0_ip: 10.5.126.60
eth1_ip: 10.5.127.42 eth1_ip: 10.5.127.42

2
playbooks/groups/wiki.yml
View file

@ -24,7 +24,7 @@
- collectd/base - collectd/base
- apache - apache
- fedmsg/base - fedmsg/base
#- { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app_staging/app/attachments' } - { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app_staging/app/attachments' }
- { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' } - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' }
- { role: mediawiki, when: env != "staging" } - { role: mediawiki, when: env != "staging" }
- { role: mediawiki, when: env == "staging" } - { role: mediawiki, when: env == "staging" }

70
roles/mediawiki/tasks/main.yml
View file

@ -25,34 +25,52 @@
- mediawiki - mediawiki
- name: install needed packages - name: install needed packages
yum: pkg={{ item }} state=present package: pkg={{ item }} state=present
with_items: with_items:
- mediawiki119 - "{{ wikiver }}"
- mediawiki119-Cite - "{{ wikiver }}-Lockdown"
- mediawiki119-Lockdown - "{{ wikiver }}-SpecialInterwiki"
- mediawiki119-SpecialInterwiki - "{{ wikiver }}-HTTP302Found"
- librsvg2 - "{{ wikiver }}-intersection"
- mediawiki119-HTTP302Found - "{{ wikiver }}-RSS"
- mediawiki119-intersection
- mediawiki119-RSS
- mediawiki-FedoraBadges - mediawiki-FedoraBadges
- mediawiki119-basset - "{{ wikiver }}-basset"
- php-zmq - php-zmq
- php-pecl-uuid - php-pecl-uuid
- librsvg2
tags: tags:
- packages - packages
- mediawiki - mediawiki
- name: install needed packages (el7 only)
package: pkg={{ item }} state=present
with_items:
- "{{ wikiver }}-Cite"
tags:
- packages
- mediawiki
when: env != 'staging'
- name: install needed packages (fedora only)
package: pkg={{ item }} state=present
with_items:
- "{{ wikiver }}-openid"
tags:
- packages
- mediawiki
when: env == 'staging'
- name: adding FAS auth - name: adding FAS auth
#template: src=Auth_FAS_CLAPLUSONE.php.j2 #template: src=Auth_FAS_CLAPLUSONE.php.j2
template: src=Auth_FAS.php.j2 template: src=Auth_FAS.php.j2
dest=/usr/share/mediawiki119/extensions/Auth_FAS.php owner=root group=root mode=775 dest=/usr/share/{{ wikiver }}/extensions/Auth_FAS.php owner=root group=root mode=775
tags: tags:
- config - config
- mediawiki - mediawiki
when: env != 'staging'
- name: adding fedmsg emit - name: adding fedmsg emit
copy: src=fedmsg-emit.php dest=/usr/share/mediawiki119/extensions/fedmsg-emit.php owner=root group=root mode=775 copy: src=fedmsg-emit.php dest=/usr/share/{{ wikiver }}/extensions/fedmsg-emit.php owner=root group=root mode=775
tags: tags:
- config - config
- mediawiki - mediawiki
@ -63,7 +81,7 @@
- mediawiki - mediawiki
- name: Fedora branding - name: Fedora branding
copy: src=skins/ dest=/usr/share/mediawiki119/skins owner=root group=root mode=775 copy: src=skins/ dest=/usr/share/{{ wikiver }}/skins owner=root group=root mode=775
tags: tags:
- config - config
- mediawiki - mediawiki
@ -74,13 +92,13 @@
- mediawiki - mediawiki
#- name: creating config dir #- name: creating config dir
# file: src=/usr/share/mediawiki119/config dest=/srv/web/{{wikiname}}/config owner=apache group=apache mode=755 state=directory # file: src=/usr/share/{{ wikiver }}/config dest=/srv/web/{{wikiname}}/config owner=apache group=apache mode=755 state=directory
# tags: # tags:
# - mediawiki # - mediawiki
# This doesn't seem to exist anymore in upstream.... # This doesn't seem to exist anymore in upstream....
#- name: install utils #- name: install utils
# file: src=/usr/share/mediawiki119/install-utils.inc dest=/srv/web/{{wikiname}}-wiki/install-utils.inc state=link # file: src=/usr/share/{{ wikiver }}/install-utils.inc dest=/srv/web/{{wikiname}}-wiki/install-utils.inc state=link
# tags: # tags:
# - mediawiki # - mediawiki
@ -97,56 +115,56 @@
- mediawiki - mediawiki
- name: linking index.php - name: linking index.php
file: dest=/srv/web/{{wikiname}}-wiki/index.php src=/usr/share/mediawiki119/index.php state=link file: dest=/srv/web/{{wikiname}}-wiki/index.php src=/usr/share/{{ wikiver }}/index.php state=link
tags: tags:
- mediawiki - mediawiki
- name: linkng api.php - name: linkng api.php
file: dest=/srv/web/{{wikiname}}-wiki/api.php src=/usr/share/mediawiki119/api.php state=link file: dest=/srv/web/{{wikiname}}-wiki/api.php src=/usr/share/{{ wikiver }}/api.php state=link
tags: tags:
- mediawiki - mediawiki
- name: linking opensearch - name: linking opensearch
file: dest=/srv/web/{{wikiname}}-wiki/opensearch_desc.php src=/usr/share/mediawiki119/opensearch_desc.php state=link file: dest=/srv/web/{{wikiname}}-wiki/opensearch_desc.php src=/usr/share/{{ wikiver }}/opensearch_desc.php state=link
tags: tags:
- mediawiki - mediawiki
- name: linking extensions - name: linking extensions
file: dest=/srv/web/{{wikiname}}-wiki/extensions src=/usr/share/mediawiki119/extensions state=link file: dest=/srv/web/{{wikiname}}-wiki/extensions src=/usr/share/{{ wikiver }}/extensions state=link
tags: tags:
- mediawiki - mediawiki
- name: linking includes - name: linking includes
file: dest=/srv/web/{{wikiname}}-wiki/includes src=/usr/share/mediawiki119/includes state=link file: dest=/srv/web/{{wikiname}}-wiki/includes src=/usr/share/{{ wikiver }}/includes state=link
tags: tags:
- mediawiki - mediawiki
- name: linking languages - name: linking languages
file: dest=/srv/web/{{wikiname}}-wiki/languages src=/usr/share/mediawiki119/languages state=link file: dest=/srv/web/{{wikiname}}-wiki/languages src=/usr/share/{{ wikiver }}/languages state=link
tags: tags:
- mediawiki - mediawiki
- name: linking maintenance - name: linking maintenance
file: dest=/srv/web/{{wikiname}}-wiki/maintenance src=/usr/share/mediawiki119/maintenance state=link file: dest=/srv/web/{{wikiname}}-wiki/maintenance src=/usr/share/{{ wikiver }}/maintenance state=link
tags: tags:
- mediawiki - mediawiki
- name: linking serialized - name: linking serialized
file: dest=/srv/web/{{wikiname}}-wiki/serialized src=/usr/share/mediawiki119/serialized state=link file: dest=/srv/web/{{wikiname}}-wiki/serialized src=/usr/share/{{ wikiver }}/serialized state=link
tags: tags:
- mediawiki - mediawiki
- name: linking skins - name: linking skins
file: dest=/srv/web/{{wikiname}}-wiki/skins src=/usr/share/mediawiki119/skins state=link file: dest=/srv/web/{{wikiname}}-wiki/skins src=/usr/share/{{ wikiver }}/skins state=link
tags: tags:
- mediawiki - mediawiki
- name: linking load - name: linking load
file: dest=/srv/web/{{wikiname}}-wiki/load.php src=/usr/share/mediawiki119/load.php state=link file: dest=/srv/web/{{wikiname}}-wiki/load.php src=/usr/share/{{ wikiver }}/load.php state=link
tags: tags:
- mediawiki - mediawiki
- name: linking resources - name: linking resources
file: dest=/srv/web/{{wikiname}}-wiki/resources src=/usr/share/mediawiki119/resources state=link file: dest=/srv/web/{{wikiname}}-wiki/resources src=/usr/share/{{ wikiver }}/resources state=link
tags: tags:
- mediawiki - mediawiki