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

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Nick Bebout 2014-10-21 00:00:54 +00:00
commit 585752e8cb
12 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inventory/host_vars/209.132.184.137
View file

@ -1,11 +1,11 @@
--- ---
instance_type: m1.xlarge instance_type: m1.xlarge
image: "{{ el7b_qcow_id }}" image: "{{ el7_qcow_id }}"
keypair: fedora-admin-20130801 keypair: fedora-admin-20130801
security_group: jenkins security_group: jenkins
zone: nova zone: nova
hostbase: jenkins-el7b hostbase: jenkins-el7
public_ip: 209.132.184.137 public_ip: 209.132.184.137
root_auth_users: pingou root_auth_users: pingou
description: jenkins el7b worker/slave description: jenkins el7 worker/slave
freezes: false freezes: false

2
inventory/inventory
View file

@ -644,7 +644,7 @@ koschei.cloud.fedoraproject.org
209.132.184.165 209.132.184.165
# F20 builder # F20 builder
209.132.184.209 209.132.184.209
# RHEL7beta builder # RHEL7 builder
209.132.184.137 209.132.184.137
[jenkins-cloud] [jenkins-cloud]

6
playbooks/groups/jenkins-cloud.yml
View file

@ -45,7 +45,7 @@
- vim - vim
- dejavu-s\* - dejavu-s\*
- fontconfig - fontconfig
- java-1.6.0-openjdk - java-1.8.0-openjdk
- httpd - httpd
- openssh-clients - openssh-clients
- git - git
@ -310,8 +310,8 @@
action: yum state=installed pkg={{ item }} action: yum state=installed pkg={{ item }}
with_items: with_items:
- vim - vim
- java-1.7.0-openjdk - java-1.8.0-openjdk
- java-1.7.0-openjdk-devel - java-1.8.0-openjdk-devel
- subversion - subversion
- bzr - bzr
- git - git

13
roles/base/files/postfix/main.cf/main.cf.mailman-stg → roles/base/files/postfix/main.cf/main.cf.mailman01.stg.phx2.fedoraproject.org
View file

@ -93,8 +93,8 @@ mail_owner = postfix
#myorigin = $myhostname #myorigin = $myhostname
#myorigin = $mydomain #myorigin = $mydomain
mydomain = fedoraproject.org mydomain = stg.fedoraproject.org
myorigin = fedoraproject.org myorigin = stg.fedoraproject.org
# RECEIVING MAIL # RECEIVING MAIL
@ -156,8 +156,7 @@ inet_interfaces = all
# #
# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
# #
mydestination = $myhostname, lists.stg.fedoraproject.org, mydestination = $myhostname, localhost.$mydomain, fedora.redhat.com, localhost, lists.stg.fedoraproject.org,
localhost.$mydomain, localhost
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
# mail.$mydomain, www.$mydomain, ftp.$mydomain # mail.$mydomain, www.$mydomain, ftp.$mydomain
@ -314,7 +313,7 @@ unknown_local_recipient_reject_code = 550
#relayhost = [mailserver.isp.tld] #relayhost = [mailserver.isp.tld]
#relayhost = uucphost #relayhost = uucphost
#relayhost = [an.ip.add.ress] #relayhost = [an.ip.add.ress]
relayhost = bastion.phx2.fedoraproject.org relayhost = bastion.phx2.fedoraproject.org
# REJECTING UNKNOWN RELAY USERS # REJECTING UNKNOWN RELAY USERS
@ -680,12 +679,12 @@ sample_directory = /usr/share/doc/postfix-2.4.5/samples
# #
readme_directory = /usr/share/doc/postfix-2.4.5/README_FILES readme_directory = /usr/share/doc/postfix-2.4.5/README_FILES
smtp_host_lookup = native,dns
# add this to new postfix to get it to add proper message-id and other # add this to new postfix to get it to add proper message-id and other
# headers to outgoing emails via the gateway. # headers to outgoing emails via the gateway.
message_size_limit = 20971520 message_size_limit = 20971520
#inet_protocols = ipv4
# Mailman, see MTA.rst # Mailman, see MTA.rst

1
roles/copr/backend/tasks/main.yml
View file

@ -129,6 +129,7 @@
- name: copy delete-forgotten-instances.cron - name: copy delete-forgotten-instances.cron
copy: src="delete-forgotten-instances.cron" dest=/etc/cron.daily/delete-forgotten-instances owner=root group=root mode=755 copy: src="delete-forgotten-instances.cron" dest=/etc/cron.daily/delete-forgotten-instances owner=root group=root mode=755
when: not devel
- name: add sign machine address into the sign.conf - name: add sign machine address into the sign.conf
lineinfile: "dest=/etc/sign.conf regexp='^server' line='server: {{ signer_host }}'" lineinfile: "dest=/etc/sign.conf regexp='^server' line='server: {{ signer_host }}'"

2
roles/koji_builder/files/builders/fedora-branched-pungi-armhfp.cfg
View file

@ -27,5 +27,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/armhfp/os
[buildroot] [buildroot]
name=buildroot name=buildroot
baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/armhfp/ baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/armhfp/
""" """

2
roles/koji_builder/files/builders/fedora-branched-pungi-i386.cfg
View file

@ -27,5 +27,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os
[buildroot] [buildroot]
name=buildroot name=buildroot
baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/i386/ baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/i386/
""" """

2
roles/koji_builder/files/builders/fedora-branched-pungi-x86_64.cfg
View file

@ -30,5 +30,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os
[buildroot] [buildroot]
name=buildroot name=buildroot
baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/x86_64/ baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/x86_64/
""" """

2
roles/mailman/files/pg-give-rights.py
View file

@ -59,7 +59,7 @@ def main():
# KittyStore # KittyStore
dbspec = re.match(""" dbspec = re.match("""
postgres:// postgresql://
(?P<user>[a-z]+) (?P<user>[a-z]+)
: :
(?P<password>[^@]+) (?P<password>[^@]+)

2
roles/mailman/templates/mailman.cfg.j2
View file

@ -21,7 +21,7 @@ pid_file: /run/mailman3/master.pid
[database] [database]
class: mailman.database.postgresql.PostgreSQLDatabase class: mailman.database.postgresql.PostgreSQLDatabase
url: postgres://mailmanadmin:{{ mailman_mailman_db_pass }}@{{ mailman_db_server }}/mailman url: postgresql://mailmanadmin:{{ mailman_mailman_db_pass }}@{{ mailman_db_server }}/mailman
[archiver.hyperkitty] [archiver.hyperkitty]
class: hyperkitty.archiver.Archiver class: hyperkitty.archiver.Archiver

2
roles/mailman/templates/settings.py.j2
View file

@ -354,7 +354,7 @@ APP_NAME = 'Fedora list archives'
USE_INTERNAL_AUTH = False USE_INTERNAL_AUTH = False
# URL to the KittyStore database # URL to the KittyStore database
KITTYSTORE_URL = 'postgres://kittystoreapp:{{ mailman_kittystore_db_pass }}@{{ mailman_db_server }}/kittystore' KITTYSTORE_URL = 'postgresql://kittystoreapp:{{ mailman_kittystore_db_pass }}@{{ mailman_db_server }}/kittystore'
# Path to the KittyStore search index (writable directory) # Path to the KittyStore search index (writable directory)
KITTYSTORE_SEARCH_INDEX = '{{ mailman_webui_basedir }}/kittystore_search_index' KITTYSTORE_SEARCH_INDEX = '{{ mailman_webui_basedir }}/kittystore_search_index'

2
roles/mailman/templates/settings_admin.py.j2
View file

@ -21,4 +21,4 @@ DATABASES = {
'PORT': '', 'PORT': '',
} }
} }
KITTYSTORE_URL = 'postgres://kittystoreadmin:{{ mailman_kittystore_admin_db_pass }}@{{ mailman_db_server }}/kittystore' KITTYSTORE_URL = 'postgresql://kittystoreadmin:{{ mailman_kittystore_admin_db_pass }}@{{ mailman_db_server }}/kittystore'