Merge branch 'master' of /git/ansible
This commit is contained in:
Nick Bebout
commit
585752e8cb
12 changed files with 21 additions and 21 deletions
|
|
@ -1,11 +1,11 @@
|
|||
---
|
||||
instance_type: m1.xlarge
|
||||
image: "{{ el7b_qcow_id }}"
|
||||
image: "{{ el7_qcow_id }}"
|
||||
keypair: fedora-admin-20130801
|
||||
security_group: jenkins
|
||||
zone: nova
|
||||
hostbase: jenkins-el7b
|
||||
hostbase: jenkins-el7
|
||||
public_ip: 209.132.184.137
|
||||
root_auth_users: pingou
|
||||
description: jenkins el7b worker/slave
|
||||
description: jenkins el7 worker/slave
|
||||
freezes: false
|
||||
|
|
|
|||
|
|
@ -644,7 +644,7 @@ koschei.cloud.fedoraproject.org
|
|||
209.132.184.165
|
||||
# F20 builder
|
||||
209.132.184.209
|
||||
# RHEL7beta builder
|
||||
# RHEL7 builder
|
||||
209.132.184.137
|
||||
|
||||
[jenkins-cloud]
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
- vim
|
||||
- dejavu-s\*
|
||||
- fontconfig
|
||||
- java-1.6.0-openjdk
|
||||
- java-1.8.0-openjdk
|
||||
- httpd
|
||||
- openssh-clients
|
||||
- git
|
||||
|
|
@ -310,8 +310,8 @@
|
|||
action: yum state=installed pkg={{ item }}
|
||||
with_items:
|
||||
- vim
|
||||
- java-1.7.0-openjdk
|
||||
- java-1.7.0-openjdk-devel
|
||||
- java-1.8.0-openjdk
|
||||
- java-1.8.0-openjdk-devel
|
||||
- subversion
|
||||
- bzr
|
||||
- git
|
||||
|
|
|
|||
|
|
@ -93,8 +93,8 @@ mail_owner = postfix
|
|||
#myorigin = $myhostname
|
||||
#myorigin = $mydomain
|
||||
|
||||
mydomain = fedoraproject.org
|
||||
myorigin = fedoraproject.org
|
||||
mydomain = stg.fedoraproject.org
|
||||
myorigin = stg.fedoraproject.org
|
||||
|
||||
# RECEIVING MAIL
|
||||
|
||||
|
|
@ -156,8 +156,7 @@ inet_interfaces = all
|
|||
#
|
||||
# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
|
||||
#
|
||||
mydestination = $myhostname, lists.stg.fedoraproject.org,
|
||||
localhost.$mydomain, localhost
|
||||
mydestination = $myhostname, localhost.$mydomain, fedora.redhat.com, localhost, lists.stg.fedoraproject.org,
|
||||
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
|
||||
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
|
||||
# mail.$mydomain, www.$mydomain, ftp.$mydomain
|
||||
|
|
@ -314,7 +313,7 @@ unknown_local_recipient_reject_code = 550
|
|||
#relayhost = [mailserver.isp.tld]
|
||||
#relayhost = uucphost
|
||||
#relayhost = [an.ip.add.ress]
|
||||
relayhost = bastion.phx2.fedoraproject.org
|
||||
relayhost = bastion.phx2.fedoraproject.org
|
||||
|
||||
|
||||
# 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
|
||||
|
||||
smtp_host_lookup = native,dns
|
||||
|
||||
# add this to new postfix to get it to add proper message-id and other
|
||||
# headers to outgoing emails via the gateway.
|
||||
|
||||
|
||||
message_size_limit = 20971520
|
||||
#inet_protocols = ipv4
|
||||
|
||||
|
||||
# Mailman, see MTA.rst
|
||||
|
|
@ -129,6 +129,7 @@
|
|||
|
||||
- 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
|
||||
when: not devel
|
||||
|
||||
- name: add sign machine address into the sign.conf
|
||||
lineinfile: "dest=/etc/sign.conf regexp='^server' line='server: {{ signer_host }}'"
|
||||
|
|
|
|||
|
|
@ -27,5 +27,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/armhfp/os
|
|||
|
||||
[buildroot]
|
||||
name=buildroot
|
||||
baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/armhfp/
|
||||
baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/armhfp/
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -27,5 +27,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os
|
|||
|
||||
[buildroot]
|
||||
name=buildroot
|
||||
baseurl=http://kojipkgs.fedoraproject.org/repos/f20-build/latest/i386/
|
||||
baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/i386/
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -30,5 +30,5 @@ baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os
|
|||
|
||||
[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/
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ def main():
|
|||
|
||||
# KittyStore
|
||||
dbspec = re.match("""
|
||||
postgres://
|
||||
postgresql://
|
||||
(?P<user>[a-z]+)
|
||||
:
|
||||
(?P<password>[^@]+)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ pid_file: /run/mailman3/master.pid
|
|||
|
||||
[database]
|
||||
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]
|
||||
class: hyperkitty.archiver.Archiver
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ APP_NAME = 'Fedora list archives'
|
|||
USE_INTERNAL_AUTH = False
|
||||
|
||||
# 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)
|
||||
KITTYSTORE_SEARCH_INDEX = '{{ mailman_webui_basedir }}/kittystore_search_index'
|
||||
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@ DATABASES = {
|
|||
'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'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue