Merge branch 'master' of /git/ansible
This commit is contained in:
commit
f26437b1f1
233 changed files with 3381 additions and 2121 deletions
|
@ -53,6 +53,10 @@ class CallbackModule(object):
|
||||||
# figure out where the playbook FILE is
|
# figure out where the playbook FILE is
|
||||||
path = os.path.abspath(play.playbook.filename)
|
path = os.path.abspath(play.playbook.filename)
|
||||||
|
|
||||||
|
# Bail out early without publishing if we're in --check mode
|
||||||
|
if play.playbook.check:
|
||||||
|
return
|
||||||
|
|
||||||
if not self.playbook:
|
if not self.playbook:
|
||||||
fedmsg.publish(
|
fedmsg.publish(
|
||||||
modname="ansible", topic="playbook.start",
|
modname="ansible", topic="playbook.start",
|
||||||
|
@ -68,6 +72,9 @@ class CallbackModule(object):
|
||||||
self.playbook = path
|
self.playbook = path
|
||||||
|
|
||||||
def playbook_on_stats(self, stats):
|
def playbook_on_stats(self, stats):
|
||||||
|
if not self.playbook:
|
||||||
|
return
|
||||||
|
|
||||||
results = dict([(h, stats.summarize(h)) for h in stats.processed])
|
results = dict([(h, stats.summarize(h)) for h in stats.processed])
|
||||||
fedmsg.publish(
|
fedmsg.publish(
|
||||||
modname="ansible", topic="playbook.complete",
|
modname="ansible", topic="playbook.complete",
|
||||||
|
|
|
@ -93,7 +93,7 @@ class LogMech(object):
|
||||||
if self.playbook_id == 'ansible-cmd':
|
if self.playbook_id == 'ansible-cmd':
|
||||||
res['task_userid'] = getlogin()
|
res['task_userid'] = getlogin()
|
||||||
for k in ("delegate_to", "environment", "first_available_file",
|
for k in ("delegate_to", "environment", "first_available_file",
|
||||||
"local_action", "notified_by", "notify", "only_if",
|
"local_action", "notified_by", "notify",
|
||||||
"register", "sudo", "sudo_user", "tags",
|
"register", "sudo", "sudo_user", "tags",
|
||||||
"transport", "when"):
|
"transport", "when"):
|
||||||
v = getattr(task, k, None)
|
v = getattr(task, k, None)
|
||||||
|
@ -133,7 +133,9 @@ class LogMech(object):
|
||||||
if category == 'OK' and data.get('changed', False):
|
if category == 'OK' and data.get('changed', False):
|
||||||
category = 'CHANGED'
|
category = 'CHANGED'
|
||||||
|
|
||||||
if self.play_info.get('check', False):
|
if self.play_info.get('check', False) and self.play_info.get('diff', False):
|
||||||
|
category = 'CHECK_DIFF:' + category
|
||||||
|
elif self.play_info.get('check', False):
|
||||||
category = 'CHECK:' + category
|
category = 'CHECK:' + category
|
||||||
|
|
||||||
fd = open(self.logpath_play + '/' + host + '.log', 'a')
|
fd = open(self.logpath_play + '/' + host + '.log', 'a')
|
||||||
|
@ -258,6 +260,7 @@ class CallbackModule(object):
|
||||||
pb_info['inventory'] = play.playbook.inventory.host_list
|
pb_info['inventory'] = play.playbook.inventory.host_list
|
||||||
pb_info['playbook_checksum'] = utils.md5(path)
|
pb_info['playbook_checksum'] = utils.md5(path)
|
||||||
pb_info['check'] = play.playbook.check
|
pb_info['check'] = play.playbook.check
|
||||||
|
pb_info['diff'] = play.playbook.diff
|
||||||
logmech.play_log(json.dumps(pb_info, indent=4))
|
logmech.play_log(json.dumps(pb_info, indent=4))
|
||||||
|
|
||||||
self._play_count += 1
|
self._play_count += 1
|
||||||
|
@ -268,6 +271,7 @@ class CallbackModule(object):
|
||||||
info['transport'] = play.transport
|
info['transport'] = play.transport
|
||||||
info['number'] = self._play_count
|
info['number'] = self._play_count
|
||||||
info['check'] = play.playbook.check
|
info['check'] = play.playbook.check
|
||||||
|
info['diff'] = play.playbook.diff
|
||||||
logmech.play_info = info
|
logmech.play_info = info
|
||||||
logmech.play_log(json.dumps(info, indent=4))
|
logmech.play_log(json.dumps(info, indent=4))
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ destdir=/var/lib/copr/public_html/results
|
||||||
sleeptime=30
|
sleeptime=30
|
||||||
|
|
||||||
# default is 8
|
# default is 8
|
||||||
num_workers=5
|
num_workers=8
|
||||||
|
|
||||||
# path to log file
|
# path to log file
|
||||||
# default is /var/log/copr/backend.log
|
# default is /var/log/copr/backend.log
|
||||||
|
@ -51,7 +51,7 @@ worker_logdir=/var/log/copr/workers/
|
||||||
# publish fedmsg notifications from workers if true
|
# publish fedmsg notifications from workers if true
|
||||||
# default is false
|
# default is false
|
||||||
#fedmsg_enabled=false
|
#fedmsg_enabled=false
|
||||||
|
fedmsg_enabled=true
|
||||||
|
|
||||||
[builder]
|
[builder]
|
||||||
# default is 1800
|
# default is 1800
|
||||||
|
|
|
@ -18,3 +18,47 @@ WSGISocketPrefix /var/run/wsgi
|
||||||
Require all granted
|
Require all granted
|
||||||
</Directory>
|
</Directory>
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
||||||
|
<VirtualHost *:443>
|
||||||
|
SSLEngine on
|
||||||
|
SSLProtocol all -SSLv2
|
||||||
|
#optimeize on speed
|
||||||
|
SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5
|
||||||
|
SSLHonorCipherOrder on
|
||||||
|
|
||||||
|
SSLCertificateFile /etc/pki/tls/ca.crt
|
||||||
|
SSLCertificateKeyFile /etc/pki/tls/private/ca.key
|
||||||
|
ServerName copr-fe.cloud.fedoraproject.org:443
|
||||||
|
|
||||||
|
WSGIPassAuthorization On
|
||||||
|
#WSGIDaemonProcess 127.0.0.1 user=copr-fe group=copr-fe threads=5
|
||||||
|
WSGIScriptAlias / /usr/share/copr/coprs_frontend/application
|
||||||
|
WSGIProcessGroup 127.0.0.1
|
||||||
|
|
||||||
|
ErrorLog logs/error_coprs
|
||||||
|
CustomLog logs/access_coprs common
|
||||||
|
|
||||||
|
<Directory /usr/share/copr>
|
||||||
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
|
Require all granted
|
||||||
|
</Directory>
|
||||||
|
</VirtualHost>
|
||||||
|
|
||||||
|
<IfModule mod_status.c>
|
||||||
|
ExtendedStatus On
|
||||||
|
|
||||||
|
<Location /server-status>
|
||||||
|
SetHandler server-status
|
||||||
|
Require all denied
|
||||||
|
Require host localhost .redhat.com
|
||||||
|
</Location>
|
||||||
|
</IfModule>
|
||||||
|
|
||||||
|
<IfModule mpm_prefork_module>
|
||||||
|
StartServers 8
|
||||||
|
MinSpareServers 8
|
||||||
|
MaxSpareServers 20
|
||||||
|
MaxClients 50
|
||||||
|
MaxRequestsPerChild 10000
|
||||||
|
</IfModule>
|
||||||
|
|
||||||
|
|
|
@ -1 +1,4 @@
|
||||||
msuchy+coprmachine@redhat.com
|
msuchy+coprmachine@redhat.com
|
||||||
|
kevin@scrye.com
|
||||||
|
nb@fedoraproject.org
|
||||||
|
sgallagh@redhat.com
|
||||||
|
|
|
@ -90,7 +90,7 @@ server.port = 80
|
||||||
##
|
##
|
||||||
## Use IPv6?
|
## Use IPv6?
|
||||||
##
|
##
|
||||||
server.use-ipv6 = "enable"
|
server.use-ipv6 = "disable"
|
||||||
|
|
||||||
##
|
##
|
||||||
## bind to a specific IP
|
## bind to a specific IP
|
||||||
|
@ -445,3 +445,11 @@ server.upload-dirs = ( "/var/tmp" )
|
||||||
#include_shell "cat /etc/lighttpd/vhosts.d/*.conf"
|
#include_shell "cat /etc/lighttpd/vhosts.d/*.conf"
|
||||||
##
|
##
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
||||||
|
$SERVER["socket"] == ":443" {
|
||||||
|
ssl.engine = "enable"
|
||||||
|
ssl.pemfile = "/etc/lighttpd/coprs-be.fedoraproject.org.pem"
|
||||||
|
ssl.ca-file = "/etc/lighttpd/coprs-be.fedoraproject.org.crt"
|
||||||
|
ssl.disable-client-renegotiation = "enable"
|
||||||
|
ssl.cipher-list = "ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4-SHA:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM"
|
||||||
|
}
|
||||||
|
|
|
@ -12,3 +12,12 @@ baseurl=http://172.16.5.4/results/msuchy/Mock/epel-6-$basearch/
|
||||||
skip_if_unavailable=True
|
skip_if_unavailable=True
|
||||||
gpgcheck=0
|
gpgcheck=0
|
||||||
enabled=1
|
enabled=1
|
||||||
|
|
||||||
|
[msuchy-scl-utils]
|
||||||
|
name=Copr repo for scl-utils owned by msuchy
|
||||||
|
description=scl-utils with patch from https://bugzilla.redhat.com/show_bug.cgi?id=985233
|
||||||
|
baseurl=http://172.16.5.4/results/msuchy/scl-utils/epel-6-$basearch/
|
||||||
|
skip_if_unavailable=True
|
||||||
|
gpgcheck=0
|
||||||
|
enabled=1
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,12 @@ config_opts['target_arch'] = 'i386'
|
||||||
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
|
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
|
||||||
config_opts['chroot_setup_cmd'] = 'install buildsys-build'
|
config_opts['chroot_setup_cmd'] = 'install buildsys-build'
|
||||||
config_opts['dist'] = 'el5' # only useful for --resultdir variable subst
|
config_opts['dist'] = 'el5' # only useful for --resultdir variable subst
|
||||||
config_opts['macros'] = {}
|
if not config_opts.has_key('macros'): config_opts['macros'] = {}
|
||||||
config_opts['macros']['%__arch_install_post'] = '%{nil}'
|
config_opts['macros']['%__arch_install_post'] = '%{nil}'
|
||||||
|
config_opts['macros']['%rhel'] = '5'
|
||||||
|
config_opts['macros']['%dist'] = '.el5'
|
||||||
|
config_opts['macros']['%el5'] = '1'
|
||||||
|
config_opts['releasever'] = '5'
|
||||||
|
|
||||||
config_opts['yum.conf'] = """
|
config_opts['yum.conf'] = """
|
||||||
[main]
|
[main]
|
||||||
|
|
|
@ -3,8 +3,12 @@ config_opts['target_arch'] = 'x86_64'
|
||||||
config_opts['legal_host_arches'] = ('x86_64',)
|
config_opts['legal_host_arches'] = ('x86_64',)
|
||||||
config_opts['chroot_setup_cmd'] = 'install buildsys-build'
|
config_opts['chroot_setup_cmd'] = 'install buildsys-build'
|
||||||
config_opts['dist'] = 'el5' # only useful for --resultdir variable subst
|
config_opts['dist'] = 'el5' # only useful for --resultdir variable subst
|
||||||
config_opts['macros'] = {}
|
if not config_opts.has_key('macros'): config_opts['macros'] = {}
|
||||||
config_opts['macros']['%__arch_install_post'] = '%{nil}'
|
config_opts['macros']['%__arch_install_post'] = '%{nil}'
|
||||||
|
config_opts['macros']['%rhel'] = '5'
|
||||||
|
config_opts['macros']['%dist'] = '.el5'
|
||||||
|
config_opts['macros']['%el5'] = '1'
|
||||||
|
config_opts['releasever'] = '5'
|
||||||
|
|
||||||
config_opts['yum.conf'] = """
|
config_opts['yum.conf'] = """
|
||||||
[main]
|
[main]
|
||||||
|
|
|
@ -6,8 +6,12 @@ config_opts['legal_host_arches'] = ('x86_64',)
|
||||||
config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-release-server redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
|
config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-release-server redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
|
||||||
config_opts['dist'] = 'el7' # only useful for --resultdir variable subst
|
config_opts['dist'] = 'el7' # only useful for --resultdir variable subst
|
||||||
config_opts['macros'] = {}
|
config_opts['macros'] = {}
|
||||||
|
config_opts['macros']['%dist'] = '.el7'
|
||||||
|
config_opts['macros']['%rhel'] = '7'
|
||||||
|
config_opts['macros']['%el7'] = '1'
|
||||||
config_opts['macros']['%_topdir'] = '/builddir/build'
|
config_opts['macros']['%_topdir'] = '/builddir/build'
|
||||||
config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
|
config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
|
||||||
|
config_opts['releasever'] = '7'
|
||||||
|
|
||||||
config_opts['plugin_conf']['root_cache_enable'] = False
|
config_opts['plugin_conf']['root_cache_enable'] = False
|
||||||
config_opts['plugin_conf']['yum_cache_enable'] = False
|
config_opts['plugin_conf']['yum_cache_enable'] = False
|
||||||
|
|
|
@ -3,6 +3,7 @@ config_opts['target_arch'] = 'i686'
|
||||||
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
|
config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
|
||||||
config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
|
config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
|
||||||
config_opts['dist'] = 'fc20' # only useful for --resultdir variable subst
|
config_opts['dist'] = 'fc20' # only useful for --resultdir variable subst
|
||||||
|
config_opts['releasever'] = '20'
|
||||||
|
|
||||||
config_opts['yum.conf'] = """
|
config_opts['yum.conf'] = """
|
||||||
[main]
|
[main]
|
||||||
|
|
|
@ -3,6 +3,7 @@ config_opts['target_arch'] = 'x86_64'
|
||||||
config_opts['legal_host_arches'] = ('x86_64',)
|
config_opts['legal_host_arches'] = ('x86_64',)
|
||||||
config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
|
config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
|
||||||
config_opts['dist'] = 'fc20' # only useful for --resultdir variable subst
|
config_opts['dist'] = 'fc20' # only useful for --resultdir variable subst
|
||||||
|
config_opts['releasever'] = '20'
|
||||||
|
|
||||||
config_opts['yum.conf'] = """
|
config_opts['yum.conf'] = """
|
||||||
[main]
|
[main]
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
10.5.125.36 kojipkgs.fedoraproject.org
|
10.5.125.36 kojipkgs.fedoraproject.org
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
10.5.124.138 arm.koji.fedoraproject.org
|
10.5.124.138 arm.koji.fedoraproject.org
|
||||||
|
10.5.124.138 armpkgs.fedoraproject.org
|
||||||
10.5.125.44 pkgs.fedoraproject.org pkgs
|
10.5.125.44 pkgs.fedoraproject.org pkgs
|
||||||
#
|
#
|
||||||
# This is proxy01.phx2.fedoraproject.org
|
# This is proxy01.phx2.fedoraproject.org
|
||||||
|
|
7
files/hosts/ask01.phx2.fedoraproject.org-hosts
Normal file
7
files/hosts/ask01.phx2.fedoraproject.org-hosts
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
|
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
10.5.126.71 db-ask
|
|
@ -2,7 +2,7 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
|
7
files/hosts/ask02.phx2.fedoraproject.org-hosts
Normal file
7
files/hosts/ask02.phx2.fedoraproject.org-hosts
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
|
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
10.5.126.71 db-ask
|
|
@ -2,7 +2,7 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
10.5.126.71 db-tahrir db-tahrir
|
10.5.126.71 db-tahrir db-tahrir
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
10.5.126.71 db-tahrir db-tahrir
|
10.5.126.71 db-tahrir db-tahrir
|
||||||
|
|
9
files/hosts/fedoauth01.stg.phx2.fedoraproject.org-hosts
Normal file
9
files/hosts/fedoauth01.stg.phx2.fedoraproject.org-hosts
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
|
10.5.126.89 admin.fedoraproject.org
|
||||||
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
10.5.126.81 memcached03 memcached03.stg app01 app01.stg
|
|
@ -2,7 +2,7 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
10.5.126.71 db-notifs db-notifs
|
||||||
|
10.5.126.109 db-datanommer db-datanommer
|
|
@ -2,10 +2,11 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
10.5.126.81 memcached03 memcached03.stg app01 app01.stg
|
10.5.126.81 memcached03 memcached03.stg app01 app01.stg
|
||||||
|
|
||||||
10.5.126.85 db-notifs db-notifs
|
10.5.126.85 db-notifs db-notifs
|
||||||
|
10.5.126.85 db-datanommer db-datanommer
|
||||||
|
|
6
files/hosts/notifs-web01.phx2.fedoraproject.org-hosts
Normal file
6
files/hosts/notifs-web01.phx2.fedoraproject.org-hosts
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
10.5.126.71 db-notifs db-notifs
|
||||||
|
10.5.126.109 db-datanommer db-datanommer
|
|
@ -2,10 +2,11 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
10.5.126.81 memcached03 memcached03.stg app01 app01.stg
|
10.5.126.81 memcached03 memcached03.stg app01 app01.stg
|
||||||
|
|
||||||
10.5.126.85 db-notifs db-notifs
|
10.5.126.85 db-notifs db-notifs
|
||||||
|
10.5.126.85 db-datanommer db-datanommer
|
||||||
|
|
6
files/hosts/notifs-web02.phx2.fedoraproject.org-hosts
Normal file
6
files/hosts/notifs-web02.phx2.fedoraproject.org-hosts
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
10.5.126.71 db-notifs db-notifs
|
||||||
|
10.5.126.109 db-datanommer db-datanommer
|
|
@ -2,10 +2,11 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
10.5.126.81 memcached03 memcached03.stg app01 app01.stg
|
10.5.126.81 memcached03 memcached03.stg app01 app01.stg
|
||||||
|
|
||||||
10.5.126.85 db-notifs db-notifs
|
10.5.126.85 db-notifs db-notifs
|
||||||
|
10.5.126.85 db-datanommer db-datanommer
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
10.5.126.71 nuancier_db nuancier_db
|
10.5.126.71 nuancier_db nuancier_db
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.52 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
10.5.126.71 nuancier_db nuancier_db
|
10.5.126.71 nuancier_db nuancier_db
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
|
||||||
|
|
||||||
10.5.126.89 admin.fedoraproject.org
|
10.5.126.89 admin.fedoraproject.org
|
||||||
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy5 proxy01 proxy02 proxy03 proxy04 proxy05 fedoraproject.org
|
10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org
|
||||||
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
|
||||||
10.5.126.23 infrastructure.fedoraproject.org
|
10.5.126.23 infrastructure.fedoraproject.org
|
||||||
|
|
||||||
|
|
430
files/hotfix/python-openid/fetchers.py
Normal file
430
files/hotfix/python-openid/fetchers.py
Normal file
|
@ -0,0 +1,430 @@
|
||||||
|
# -*- test-case-name: openid.test.test_fetchers -*-
|
||||||
|
"""
|
||||||
|
This module contains the HTTP fetcher interface and several implementations.
|
||||||
|
"""
|
||||||
|
|
||||||
|
__all__ = ['fetch', 'getDefaultFetcher', 'setDefaultFetcher', 'HTTPResponse',
|
||||||
|
'HTTPFetcher', 'createHTTPFetcher', 'HTTPFetchingError',
|
||||||
|
'HTTPError']
|
||||||
|
|
||||||
|
import urllib2
|
||||||
|
import time
|
||||||
|
import cStringIO
|
||||||
|
import sys
|
||||||
|
|
||||||
|
import openid
|
||||||
|
import openid.urinorm
|
||||||
|
|
||||||
|
# Try to import httplib2 for caching support
|
||||||
|
# http://bitworking.org/projects/httplib2/
|
||||||
|
try:
|
||||||
|
import httplib2
|
||||||
|
except ImportError:
|
||||||
|
# httplib2 not available
|
||||||
|
httplib2 = None
|
||||||
|
|
||||||
|
# try to import pycurl, which will let us use CurlHTTPFetcher
|
||||||
|
try:
|
||||||
|
import pycurl
|
||||||
|
except ImportError:
|
||||||
|
pycurl = None
|
||||||
|
|
||||||
|
USER_AGENT = "python-openid/%s (%s)" % (openid.__version__, sys.platform)
|
||||||
|
MAX_RESPONSE_KB = 1024
|
||||||
|
|
||||||
|
def fetch(url, body=None, headers=None):
|
||||||
|
"""Invoke the fetch method on the default fetcher. Most users
|
||||||
|
should need only this method.
|
||||||
|
|
||||||
|
@raises Exception: any exceptions that may be raised by the default fetcher
|
||||||
|
"""
|
||||||
|
fetcher = getDefaultFetcher()
|
||||||
|
return fetcher.fetch(url, body, headers)
|
||||||
|
|
||||||
|
def createHTTPFetcher():
|
||||||
|
"""Create a default HTTP fetcher instance
|
||||||
|
|
||||||
|
prefers Curl to urllib2."""
|
||||||
|
if pycurl is None:
|
||||||
|
fetcher = Urllib2Fetcher()
|
||||||
|
else:
|
||||||
|
fetcher = CurlHTTPFetcher()
|
||||||
|
|
||||||
|
return fetcher
|
||||||
|
|
||||||
|
# Contains the currently set HTTP fetcher. If it is set to None, the
|
||||||
|
# library will call createHTTPFetcher() to set it. Do not access this
|
||||||
|
# variable outside of this module.
|
||||||
|
_default_fetcher = None
|
||||||
|
|
||||||
|
def getDefaultFetcher():
|
||||||
|
"""Return the default fetcher instance
|
||||||
|
if no fetcher has been set, it will create a default fetcher.
|
||||||
|
|
||||||
|
@return: the default fetcher
|
||||||
|
@rtype: HTTPFetcher
|
||||||
|
"""
|
||||||
|
global _default_fetcher
|
||||||
|
|
||||||
|
if _default_fetcher is None:
|
||||||
|
setDefaultFetcher(createHTTPFetcher())
|
||||||
|
|
||||||
|
return _default_fetcher
|
||||||
|
|
||||||
|
def setDefaultFetcher(fetcher, wrap_exceptions=True):
|
||||||
|
"""Set the default fetcher
|
||||||
|
|
||||||
|
@param fetcher: The fetcher to use as the default HTTP fetcher
|
||||||
|
@type fetcher: HTTPFetcher
|
||||||
|
|
||||||
|
@param wrap_exceptions: Whether to wrap exceptions thrown by the
|
||||||
|
fetcher wil HTTPFetchingError so that they may be caught
|
||||||
|
easier. By default, exceptions will be wrapped. In general,
|
||||||
|
unwrapped fetchers are useful for debugging of fetching errors
|
||||||
|
or if your fetcher raises well-known exceptions that you would
|
||||||
|
like to catch.
|
||||||
|
@type wrap_exceptions: bool
|
||||||
|
"""
|
||||||
|
global _default_fetcher
|
||||||
|
if fetcher is None or not wrap_exceptions:
|
||||||
|
_default_fetcher = fetcher
|
||||||
|
else:
|
||||||
|
_default_fetcher = ExceptionWrappingFetcher(fetcher)
|
||||||
|
|
||||||
|
def usingCurl():
|
||||||
|
"""Whether the currently set HTTP fetcher is a Curl HTTP fetcher."""
|
||||||
|
fetcher = getDefaultFetcher()
|
||||||
|
if isinstance(fetcher, ExceptionWrappingFetcher):
|
||||||
|
fetcher = fetcher.fetcher
|
||||||
|
return isinstance(fetcher, CurlHTTPFetcher)
|
||||||
|
|
||||||
|
class HTTPResponse(object):
|
||||||
|
"""XXX document attributes"""
|
||||||
|
headers = None
|
||||||
|
status = None
|
||||||
|
body = None
|
||||||
|
final_url = None
|
||||||
|
|
||||||
|
def __init__(self, final_url=None, status=None, headers=None, body=None):
|
||||||
|
self.final_url = final_url
|
||||||
|
self.status = status
|
||||||
|
self.headers = headers
|
||||||
|
self.body = body
|
||||||
|
|
||||||
|
def __repr__(self):
|
||||||
|
return "<%s status %s for %s>" % (self.__class__.__name__,
|
||||||
|
self.status,
|
||||||
|
self.final_url)
|
||||||
|
|
||||||
|
class HTTPFetcher(object):
|
||||||
|
"""
|
||||||
|
This class is the interface for openid HTTP fetchers. This
|
||||||
|
interface is only important if you need to write a new fetcher for
|
||||||
|
some reason.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def fetch(self, url, body=None, headers=None):
|
||||||
|
"""
|
||||||
|
This performs an HTTP POST or GET, following redirects along
|
||||||
|
the way. If a body is specified, then the request will be a
|
||||||
|
POST. Otherwise, it will be a GET.
|
||||||
|
|
||||||
|
|
||||||
|
@param headers: HTTP headers to include with the request
|
||||||
|
@type headers: {str:str}
|
||||||
|
|
||||||
|
@return: An object representing the server's HTTP response. If
|
||||||
|
there are network or protocol errors, an exception will be
|
||||||
|
raised. HTTP error responses, like 404 or 500, do not
|
||||||
|
cause exceptions.
|
||||||
|
|
||||||
|
@rtype: L{HTTPResponse}
|
||||||
|
|
||||||
|
@raise Exception: Different implementations will raise
|
||||||
|
different errors based on the underlying HTTP library.
|
||||||
|
"""
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
def _allowedURL(url):
|
||||||
|
return url.startswith('http://') or url.startswith('https://')
|
||||||
|
|
||||||
|
class HTTPFetchingError(Exception):
|
||||||
|
"""Exception that is wrapped around all exceptions that are raised
|
||||||
|
by the underlying fetcher when using the ExceptionWrappingFetcher
|
||||||
|
|
||||||
|
@ivar why: The exception that caused this exception
|
||||||
|
"""
|
||||||
|
def __init__(self, why=None):
|
||||||
|
Exception.__init__(self, why)
|
||||||
|
self.why = why
|
||||||
|
|
||||||
|
class ExceptionWrappingFetcher(HTTPFetcher):
|
||||||
|
"""Fetcher that wraps another fetcher, causing all exceptions
|
||||||
|
|
||||||
|
@cvar uncaught_exceptions: Exceptions that should be exposed to the
|
||||||
|
user if they are raised by the fetch call
|
||||||
|
"""
|
||||||
|
|
||||||
|
uncaught_exceptions = (SystemExit, KeyboardInterrupt, MemoryError)
|
||||||
|
|
||||||
|
def __init__(self, fetcher):
|
||||||
|
self.fetcher = fetcher
|
||||||
|
|
||||||
|
def fetch(self, *args, **kwargs):
|
||||||
|
try:
|
||||||
|
return self.fetcher.fetch(*args, **kwargs)
|
||||||
|
except self.uncaught_exceptions:
|
||||||
|
raise
|
||||||
|
except:
|
||||||
|
exc_cls, exc_inst = sys.exc_info()[:2]
|
||||||
|
if exc_inst is None:
|
||||||
|
# string exceptions
|
||||||
|
exc_inst = exc_cls
|
||||||
|
|
||||||
|
raise HTTPFetchingError(why=exc_inst)
|
||||||
|
|
||||||
|
class Urllib2Fetcher(HTTPFetcher):
|
||||||
|
"""An C{L{HTTPFetcher}} that uses urllib2.
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Parameterized for the benefit of testing frameworks, see
|
||||||
|
# http://trac.openidenabled.com/trac/ticket/85
|
||||||
|
urlopen = staticmethod(urllib2.urlopen)
|
||||||
|
|
||||||
|
def fetch(self, url, body=None, headers=None):
|
||||||
|
if not _allowedURL(url):
|
||||||
|
raise ValueError('Bad URL scheme: %r' % (url,))
|
||||||
|
|
||||||
|
if headers is None:
|
||||||
|
headers = {}
|
||||||
|
|
||||||
|
headers.setdefault(
|
||||||
|
'User-Agent',
|
||||||
|
"%s Python-urllib/%s" % (USER_AGENT, urllib2.__version__,))
|
||||||
|
|
||||||
|
req = urllib2.Request(url, data=body, headers=headers)
|
||||||
|
try:
|
||||||
|
f = self.urlopen(req)
|
||||||
|
try:
|
||||||
|
return self._makeResponse(f)
|
||||||
|
finally:
|
||||||
|
f.close()
|
||||||
|
except urllib2.HTTPError, why:
|
||||||
|
try:
|
||||||
|
return self._makeResponse(why)
|
||||||
|
finally:
|
||||||
|
why.close()
|
||||||
|
|
||||||
|
def _makeResponse(self, urllib2_response):
|
||||||
|
resp = HTTPResponse()
|
||||||
|
resp.body = urllib2_response.read(MAX_RESPONSE_KB * 1024)
|
||||||
|
resp.final_url = urllib2_response.geturl()
|
||||||
|
resp.headers = dict(urllib2_response.info().items())
|
||||||
|
|
||||||
|
if hasattr(urllib2_response, 'code'):
|
||||||
|
resp.status = urllib2_response.code
|
||||||
|
else:
|
||||||
|
resp.status = 200
|
||||||
|
|
||||||
|
return resp
|
||||||
|
|
||||||
|
class HTTPError(HTTPFetchingError):
|
||||||
|
"""
|
||||||
|
This exception is raised by the C{L{CurlHTTPFetcher}} when it
|
||||||
|
encounters an exceptional situation fetching a URL.
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
# XXX: define what we mean by paranoid, and make sure it is.
|
||||||
|
class CurlHTTPFetcher(HTTPFetcher):
|
||||||
|
"""
|
||||||
|
An C{L{HTTPFetcher}} that uses pycurl for fetching.
|
||||||
|
See U{http://pycurl.sourceforge.net/}.
|
||||||
|
"""
|
||||||
|
ALLOWED_TIME = 20 # seconds
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
HTTPFetcher.__init__(self)
|
||||||
|
if pycurl is None:
|
||||||
|
raise RuntimeError('Cannot find pycurl library')
|
||||||
|
|
||||||
|
def _parseHeaders(self, header_file):
|
||||||
|
header_file.seek(0)
|
||||||
|
|
||||||
|
# Remove the status line from the beginning of the input
|
||||||
|
unused_http_status_line = header_file.readline().lower ()
|
||||||
|
while unused_http_status_line.lower().startswith('http/1.1 1'):
|
||||||
|
unused_http_status_line = header_file.readline()
|
||||||
|
unused_http_status_line = header_file.readline()
|
||||||
|
|
||||||
|
lines = [line.strip() for line in header_file]
|
||||||
|
|
||||||
|
# and the blank line from the end
|
||||||
|
empty_line = lines.pop()
|
||||||
|
if empty_line:
|
||||||
|
raise HTTPError("No blank line at end of headers: %r" % (line,))
|
||||||
|
|
||||||
|
headers = {}
|
||||||
|
for line in lines:
|
||||||
|
try:
|
||||||
|
name, value = line.split(':', 1)
|
||||||
|
except ValueError:
|
||||||
|
raise HTTPError(
|
||||||
|
"Malformed HTTP header line in response: %r" % (line,))
|
||||||
|
|
||||||
|
value = value.strip()
|
||||||
|
|
||||||
|
# HTTP headers are case-insensitive
|
||||||
|
name = name.lower()
|
||||||
|
headers[name] = value
|
||||||
|
|
||||||
|
return headers
|
||||||
|
|
||||||
|
def _checkURL(self, url):
|
||||||
|
# XXX: document that this can be overridden to match desired policy
|
||||||
|
# XXX: make sure url is well-formed and routeable
|
||||||
|
return _allowedURL(url)
|
||||||
|
|
||||||
|
def fetch(self, url, body=None, headers=None):
|
||||||
|
stop = int(time.time()) + self.ALLOWED_TIME
|
||||||
|
off = self.ALLOWED_TIME
|
||||||
|
|
||||||
|
if headers is None:
|
||||||
|
headers = {}
|
||||||
|
|
||||||
|
headers.setdefault('User-Agent',
|
||||||
|
"%s %s" % (USER_AGENT, pycurl.version,))
|
||||||
|
|
||||||
|
header_list = []
|
||||||
|
if headers is not None:
|
||||||
|
for header_name, header_value in headers.iteritems():
|
||||||
|
header_list.append('%s: %s' % (header_name, header_value))
|
||||||
|
|
||||||
|
c = pycurl.Curl()
|
||||||
|
try:
|
||||||
|
c.setopt(pycurl.NOSIGNAL, 1)
|
||||||
|
|
||||||
|
if header_list:
|
||||||
|
c.setopt(pycurl.HTTPHEADER, header_list)
|
||||||
|
|
||||||
|
# Presence of a body indicates that we should do a POST
|
||||||
|
if body is not None:
|
||||||
|
c.setopt(pycurl.POST, 1)
|
||||||
|
c.setopt(pycurl.POSTFIELDS, body)
|
||||||
|
|
||||||
|
while off > 0:
|
||||||
|
if not self._checkURL(url):
|
||||||
|
raise HTTPError("Fetching URL not allowed: %r" % (url,))
|
||||||
|
|
||||||
|
data = cStringIO.StringIO()
|
||||||
|
def write_data(chunk):
|
||||||
|
if data.tell() > 1024*MAX_RESPONSE_KB:
|
||||||
|
return 0
|
||||||
|
else:
|
||||||
|
return data.write(chunk)
|
||||||
|
|
||||||
|
response_header_data = cStringIO.StringIO()
|
||||||
|
c.setopt(pycurl.WRITEFUNCTION, write_data)
|
||||||
|
c.setopt(pycurl.HEADERFUNCTION, response_header_data.write)
|
||||||
|
c.setopt(pycurl.TIMEOUT, off)
|
||||||
|
c.setopt(pycurl.URL, openid.urinorm.urinorm(url))
|
||||||
|
|
||||||
|
c.perform()
|
||||||
|
|
||||||
|
response_headers = self._parseHeaders(response_header_data)
|
||||||
|
code = c.getinfo(pycurl.RESPONSE_CODE)
|
||||||
|
if code in [301, 302, 303, 307]:
|
||||||
|
url = response_headers.get('location')
|
||||||
|
if url is None:
|
||||||
|
raise HTTPError(
|
||||||
|
'Redirect (%s) returned without a location' % code)
|
||||||
|
|
||||||
|
# Redirects are always GETs
|
||||||
|
c.setopt(pycurl.POST, 0)
|
||||||
|
|
||||||
|
# There is no way to reset POSTFIELDS to empty and
|
||||||
|
# reuse the connection, but we only use it once.
|
||||||
|
else:
|
||||||
|
resp = HTTPResponse()
|
||||||
|
resp.headers = response_headers
|
||||||
|
resp.status = code
|
||||||
|
resp.final_url = url
|
||||||
|
resp.body = data.getvalue()
|
||||||
|
return resp
|
||||||
|
|
||||||
|
off = stop - int(time.time())
|
||||||
|
|
||||||
|
raise HTTPError("Timed out fetching: %r" % (url,))
|
||||||
|
finally:
|
||||||
|
c.close()
|
||||||
|
|
||||||
|
class HTTPLib2Fetcher(HTTPFetcher):
|
||||||
|
"""A fetcher that uses C{httplib2} for performing HTTP
|
||||||
|
requests. This implementation supports HTTP caching.
|
||||||
|
|
||||||
|
@see: http://bitworking.org/projects/httplib2/
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, cache=None):
|
||||||
|
"""@param cache: An object suitable for use as an C{httplib2}
|
||||||
|
cache. If a string is passed, it is assumed to be a
|
||||||
|
directory name.
|
||||||
|
"""
|
||||||
|
if httplib2 is None:
|
||||||
|
raise RuntimeError('Cannot find httplib2 library. '
|
||||||
|
'See http://bitworking.org/projects/httplib2/')
|
||||||
|
|
||||||
|
super(HTTPLib2Fetcher, self).__init__()
|
||||||
|
|
||||||
|
# An instance of the httplib2 object that performs HTTP requests
|
||||||
|
self.httplib2 = httplib2.Http(cache)
|
||||||
|
|
||||||
|
# We want httplib2 to raise exceptions for errors, just like
|
||||||
|
# the other fetchers.
|
||||||
|
self.httplib2.force_exception_to_status_code = False
|
||||||
|
|
||||||
|
def fetch(self, url, body=None, headers=None):
|
||||||
|
"""Perform an HTTP request
|
||||||
|
|
||||||
|
@raises Exception: Any exception that can be raised by httplib2
|
||||||
|
|
||||||
|
@see: C{L{HTTPFetcher.fetch}}
|
||||||
|
"""
|
||||||
|
if body:
|
||||||
|
method = 'POST'
|
||||||
|
else:
|
||||||
|
method = 'GET'
|
||||||
|
|
||||||
|
if headers is None:
|
||||||
|
headers = {}
|
||||||
|
|
||||||
|
# httplib2 doesn't check to make sure that the URL's scheme is
|
||||||
|
# 'http' so we do it here.
|
||||||
|
if not (url.startswith('http://') or url.startswith('https://')):
|
||||||
|
raise ValueError('URL is not a HTTP URL: %r' % (url,))
|
||||||
|
|
||||||
|
httplib2_response, content = self.httplib2.request(
|
||||||
|
url, method, body=body, headers=headers)
|
||||||
|
|
||||||
|
# Translate the httplib2 response to our HTTP response abstraction
|
||||||
|
|
||||||
|
# When a 400 is returned, there is no "content-location"
|
||||||
|
# header set. This seems like a bug to me. I can't think of a
|
||||||
|
# case where we really care about the final URL when it is an
|
||||||
|
# error response, but being careful about it can't hurt.
|
||||||
|
try:
|
||||||
|
final_url = httplib2_response['content-location']
|
||||||
|
except KeyError:
|
||||||
|
# We're assuming that no redirects occurred
|
||||||
|
assert not httplib2_response.previous
|
||||||
|
|
||||||
|
# And this should never happen for a successful response
|
||||||
|
assert httplib2_response.status != 200
|
||||||
|
final_url = url
|
||||||
|
|
||||||
|
return HTTPResponse(
|
||||||
|
body=content,
|
||||||
|
final_url=final_url,
|
||||||
|
headers=dict(httplib2_response.items()),
|
||||||
|
status=httplib2_response.status,
|
||||||
|
)
|
|
@ -78,6 +78,22 @@ class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
|
||||||
<label></label>
|
<label></label>
|
||||||
<nodeProperties/>
|
<nodeProperties/>
|
||||||
</slave>
|
</slave>
|
||||||
|
<slave>
|
||||||
|
<name>Fedora20</name>
|
||||||
|
<description></description>
|
||||||
|
<remoteFS>/mnt/jenkins/</remoteFS>
|
||||||
|
<numExecutors>2</numExecutors>
|
||||||
|
<mode>NORMAL</mode>
|
||||||
|
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
|
||||||
|
<launcher class="hudson.plugins.sshslaves.SSHLauncher"
|
||||||
|
plugin="ssh-slaves@0.21">
|
||||||
|
<host>172.16.5.23</host>
|
||||||
|
<port>22</port>
|
||||||
|
<credentialsId>950d5dd7-acb2-402a-8670-21f152d04928</credentialsId>
|
||||||
|
</launcher>
|
||||||
|
<label></label>
|
||||||
|
<nodeProperties/>
|
||||||
|
</slave>
|
||||||
</slaves>
|
</slaves>
|
||||||
<quietPeriod>5</quietPeriod>
|
<quietPeriod>5</quietPeriod>
|
||||||
<scmCheckoutRetryCount>0</scmCheckoutRetryCount>
|
<scmCheckoutRetryCount>0</scmCheckoutRetryCount>
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
<?xml version='1.0' encoding='UTF-8'?>
|
||||||
|
<!-- plugin requested by user rholy (ticket #4175) -->
|
||||||
|
<hudson.plugins.warnings.WarningsDescriptor plugin="warnings@4.39">
|
||||||
|
<groovyParsers>
|
||||||
|
<hudson.plugins.warnings.GroovyParser>
|
||||||
|
<name>pyflakes</name>
|
||||||
|
<regexp>^(.*):([0-9]*):(.*)$</regexp>
|
||||||
|
<script>import hudson.plugins.warnings.parser.Warning
|
||||||
|
import hudson.plugins.analysis.util.model.Priority
|
||||||
|
|
||||||
|
String fileName = matcher.group(1)
|
||||||
|
String category = "PyFlakes Error"
|
||||||
|
String lineNumber = matcher.group(2)
|
||||||
|
String message = matcher.group(3)
|
||||||
|
|
||||||
|
return new Warning(fileName, Integer.parseInt(lineNumber), category, "PyFlakes Parser", message, Priority.NORMAL);</script>
|
||||||
|
<example></example>
|
||||||
|
<linkName>https://pypi.python.org/pypi/pyflakes</linkName>
|
||||||
|
<trendName>pyflakes errors</trendName>
|
||||||
|
</hudson.plugins.warnings.GroovyParser>
|
||||||
|
</groovyParsers>
|
||||||
|
</hudson.plugins.warnings.WarningsDescriptor>
|
|
@ -1,96 +0,0 @@
|
||||||
#
|
|
||||||
# Aliases in this file will NOT be expanded in the header from
|
|
||||||
# Mail, but WILL be visible over networks or from /bin/mail.
|
|
||||||
#
|
|
||||||
# >>>>>>>>>> The program "newaliases" must be run after
|
|
||||||
# >> NOTE >> this file is updated for any changes to
|
|
||||||
# >>>>>>>>>> show through to sendmail.
|
|
||||||
#
|
|
||||||
|
|
||||||
# Basic system aliases -- these MUST be present.
|
|
||||||
mailer-daemon: postmaster
|
|
||||||
postmaster: root
|
|
||||||
|
|
||||||
# General redirections for pseudo accounts.
|
|
||||||
bin: root
|
|
||||||
daemon: root
|
|
||||||
adm: root
|
|
||||||
lp: root
|
|
||||||
sync: root
|
|
||||||
shutdown: root
|
|
||||||
halt: root
|
|
||||||
mail: root
|
|
||||||
news: root
|
|
||||||
uucp: root
|
|
||||||
operator: root
|
|
||||||
games: root
|
|
||||||
gopher: root
|
|
||||||
ftp: root
|
|
||||||
nobody: root
|
|
||||||
radiusd: root
|
|
||||||
nut: root
|
|
||||||
dbus: root
|
|
||||||
vcsa: root
|
|
||||||
canna: root
|
|
||||||
wnn: root
|
|
||||||
rpm: root
|
|
||||||
nscd: root
|
|
||||||
pcap: root
|
|
||||||
apache: root
|
|
||||||
webalizer: root
|
|
||||||
dovecot: root
|
|
||||||
fax: root
|
|
||||||
quagga: root
|
|
||||||
radvd: root
|
|
||||||
pvm: root
|
|
||||||
amandabackup: root
|
|
||||||
privoxy: root
|
|
||||||
ident: root
|
|
||||||
named: root
|
|
||||||
xfs: root
|
|
||||||
gdm: root
|
|
||||||
mailnull: root
|
|
||||||
postgres: root
|
|
||||||
sshd: root
|
|
||||||
smmsp: root
|
|
||||||
postfix: root
|
|
||||||
netdump: root
|
|
||||||
ldap: root
|
|
||||||
squid: root
|
|
||||||
ntp: root
|
|
||||||
mysql: root
|
|
||||||
desktop: root
|
|
||||||
rpcuser: root
|
|
||||||
rpc: root
|
|
||||||
nfsnobody: root
|
|
||||||
|
|
||||||
ingres: root
|
|
||||||
system: root
|
|
||||||
toor: root
|
|
||||||
manager: root
|
|
||||||
dumper: root
|
|
||||||
abuse: root
|
|
||||||
|
|
||||||
newsadm: news
|
|
||||||
newsadmin: news
|
|
||||||
usenet: news
|
|
||||||
ftpadm: ftp
|
|
||||||
ftpadmin: ftp
|
|
||||||
ftp-adm: ftp
|
|
||||||
ftp-admin: ftp
|
|
||||||
www: webmaster
|
|
||||||
webmaster: root
|
|
||||||
noc: root
|
|
||||||
security: root
|
|
||||||
hostmaster: root
|
|
||||||
info: postmaster
|
|
||||||
marketing: postmaster
|
|
||||||
sales: postmaster
|
|
||||||
support: postmaster
|
|
||||||
|
|
||||||
|
|
||||||
# trap decode to catch security attacks
|
|
||||||
decode: root
|
|
||||||
|
|
||||||
# Person who should get root's mail
|
|
||||||
root: abompard@fedoraproject.org
|
|
|
@ -1,27 +0,0 @@
|
||||||
#Alias /robots.txt /etc/hyperkitty/sites/default/static/robots.txt
|
|
||||||
#Alias /favicon.ico /etc/hyperkitty/sites/default/static/favicon.ico
|
|
||||||
Alias /hyperkitty/static /var/lib/hyperkitty/sites/default/static
|
|
||||||
|
|
||||||
#ErrorLog /var/log/httpd/hyperkitty_error.log
|
|
||||||
#CustomLog /var/log/httpd/hyperkitty_access.log combined
|
|
||||||
|
|
||||||
WSGIScriptAlias /hyperkitty /etc/hyperkitty/sites/default/wsgi.py
|
|
||||||
WSGIDaemonProcess hyperkitty threads=25 python-path=/etc/hyperkitty/sites/default
|
|
||||||
# If using VirtualEnv
|
|
||||||
#WSGIDaemonProcess hyperkitty threads=25 python-path=/etc/hyperkitty/sites/default:/path/to/your/venv/lib/python2.X/site-packages
|
|
||||||
WSGISocketPrefix run/wsgi
|
|
||||||
|
|
||||||
<Directory "/etc/hyperkitty/sites/default">
|
|
||||||
<Files wsgi.py>
|
|
||||||
Order deny,allow
|
|
||||||
Allow from all
|
|
||||||
Require all granted
|
|
||||||
</Files>
|
|
||||||
WSGIProcessGroup hyperkitty
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
<Directory "/var/lib/hyperkitty/sites/default/static">
|
|
||||||
Order deny,allow
|
|
||||||
Allow from all
|
|
||||||
Require all granted
|
|
||||||
</Directory>
|
|
|
@ -1,3 +0,0 @@
|
||||||
[general]
|
|
||||||
base_url: http://lists-dev.cloud.fedoraproject.org/
|
|
||||||
django_settings: /etc/hyperkitty/sites/default/settings.py
|
|
|
@ -1,10 +0,0 @@
|
||||||
/var/log/hyperkitty/*.log {
|
|
||||||
missingok
|
|
||||||
notifempty
|
|
||||||
sharedscripts
|
|
||||||
delaycompress
|
|
||||||
su root apache
|
|
||||||
postrotate
|
|
||||||
/sbin/service httpd reload > /dev/null 2>/dev/null || true
|
|
||||||
endscript
|
|
||||||
}
|
|
|
@ -1,96 +0,0 @@
|
||||||
#-*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
"""
|
|
||||||
Django local settings for the hyperkitty project.
|
|
||||||
"""
|
|
||||||
|
|
||||||
DEBUG = True
|
|
||||||
TEMPLATE_DEBUG = DEBUG
|
|
||||||
|
|
||||||
ADMINS = ()
|
|
||||||
DATABASES = {
|
|
||||||
'default': {
|
|
||||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
|
||||||
'NAME': 'hyperkitty',
|
|
||||||
'USER': 'hyperkitty',
|
|
||||||
'PASSWORD': '{{ lists_dev_hk_db_pass }}',
|
|
||||||
'HOST': 'localhost',
|
|
||||||
'PORT': '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
# URL prefix for static files.
|
|
||||||
# Example: "http://media.lawrence.com/static/"
|
|
||||||
STATIC_URL = '/hyperkitty/static/'
|
|
||||||
|
|
||||||
# Add Fedora to the authentication backends
|
|
||||||
AUTHENTICATION_BACKENDS = (
|
|
||||||
'social_auth.backends.browserid.BrowserIDBackend',
|
|
||||||
'hyperkitty.lib.fedora.FedoraBackend',
|
|
||||||
'social_auth.backends.google.GoogleBackend',
|
|
||||||
'social_auth.backends.yahoo.YahooBackend',
|
|
||||||
#'social_auth.backends.OpenIDBackend',
|
|
||||||
'django.contrib.auth.backends.ModelBackend',
|
|
||||||
)
|
|
||||||
|
|
||||||
# Use the email address as the username (add associate_by_email).
|
|
||||||
SOCIAL_AUTH_PIPELINE = (
|
|
||||||
'social_auth.backends.pipeline.social.social_auth_user',
|
|
||||||
'social_auth.backends.pipeline.associate.associate_by_email',
|
|
||||||
'social_auth.backends.pipeline.user.get_username',
|
|
||||||
'social_auth.backends.pipeline.user.create_user',
|
|
||||||
'social_auth.backends.pipeline.social.associate_user',
|
|
||||||
'social_auth.backends.pipeline.social.load_extra_data',
|
|
||||||
'social_auth.backends.pipeline.user.update_user_details'
|
|
||||||
)
|
|
||||||
|
|
||||||
# A sample logging configuration. The only tangible logging
|
|
||||||
# performed by this configuration is to send an email to
|
|
||||||
# the site admins on every HTTP 500 error.
|
|
||||||
# See http://docs.djangoproject.com/en/dev/topics/logging for
|
|
||||||
# more details on how to customize your logging configuration.
|
|
||||||
LOGGING = {
|
|
||||||
'version': 1,
|
|
||||||
'disable_existing_loggers': False,
|
|
||||||
'handlers': {
|
|
||||||
'mail_admins': {
|
|
||||||
'level': 'ERROR',
|
|
||||||
'class': 'django.utils.log.AdminEmailHandler'
|
|
||||||
},
|
|
||||||
'file':{
|
|
||||||
'level': 'DEBUG',
|
|
||||||
#'class': 'logging.handlers.RotatingFileHandler',
|
|
||||||
'class': 'logging.FileHandler',
|
|
||||||
'filename': '/var/log/hyperkitty/hyperkitty.log',
|
|
||||||
'formatter': 'verbose',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
'loggers': {
|
|
||||||
'django.request': {
|
|
||||||
'handlers': ['file'],
|
|
||||||
'level': 'ERROR',
|
|
||||||
'propagate': True,
|
|
||||||
},
|
|
||||||
'django': {
|
|
||||||
'handlers': ['file'],
|
|
||||||
'level': 'ERROR',
|
|
||||||
'propagate': True,
|
|
||||||
},
|
|
||||||
'hyperkitty': {
|
|
||||||
'handlers': ['file'],
|
|
||||||
'level': 'DEBUG',
|
|
||||||
'propagate': True,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
'formatters': {
|
|
||||||
'verbose': {
|
|
||||||
'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
|
|
||||||
},
|
|
||||||
'simple': {
|
|
||||||
'format': '%(levelname)s %(message)s'
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
APP_NAME = 'Fedora list archives'
|
|
||||||
KITTYSTORE_URL = 'postgres://kittystore:{{ lists_dev_ks_db_pass }}@localhost/kittystore'
|
|
||||||
USE_MOCKUPS = False
|
|
|
@ -1,37 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# This file is part of HyperKitty.
|
|
||||||
#
|
|
||||||
# HyperKitty is free software: you can redistribute it and/or modify it under
|
|
||||||
# the terms of the GNU General Public License as published by the Free
|
|
||||||
# Software Foundation, either version 3 of the License, or (at your option)
|
|
||||||
# any later version.
|
|
||||||
#
|
|
||||||
# HyperKitty is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
# more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along with
|
|
||||||
# HyperKitty. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
import hyperkitty
|
|
||||||
|
|
||||||
from django.conf.urls.defaults import *
|
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
# Uncomment the next two lines to enable the admin:
|
|
||||||
from django.contrib import admin
|
|
||||||
admin.autodiscover()
|
|
||||||
|
|
||||||
# Import mailman urls and set urlpatterns if you want to hook
|
|
||||||
# mailman_django into an existing django site.
|
|
||||||
# Otherwise set ROOT_URLCONF in settings.py to
|
|
||||||
# `mailman_django.urls`.
|
|
||||||
# from mailman_django import urls as mailman_urls
|
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
|
||||||
url(r'^$', 'hyperkitty.views.pages.index'),
|
|
||||||
url(r'', include('hyperkitty.urls')),
|
|
||||||
)
|
|
|
@ -1,8 +0,0 @@
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
<ul>
|
|
||||||
<li><a href="/hyperkitty">Archives</a></li>
|
|
||||||
<li><a href="/postorius">Management</a></li>
|
|
||||||
</ul>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
|
@ -1,25 +0,0 @@
|
||||||
# This is the absolute bare minimum base configuration file. User supplied
|
|
||||||
# configurations are pushed onto this.
|
|
||||||
|
|
||||||
[mailman]
|
|
||||||
site_owner: root@localhost
|
|
||||||
|
|
||||||
# Set the paths to be Fedora-compliant
|
|
||||||
layout: fhs
|
|
||||||
[paths.fhs]
|
|
||||||
var_dir: /srv/persist/mailman
|
|
||||||
bin_dir: /usr/libexec/mailman
|
|
||||||
lock_dir: /run/lock/mailman
|
|
||||||
pid_file: /run/mailman/master.pid
|
|
||||||
|
|
||||||
[database]
|
|
||||||
class: mailman.database.postgresql.PostgreSQLDatabase
|
|
||||||
url: postgres://mailman:{{ lists_dev_mm_db_pass }}@localhost/mailman
|
|
||||||
|
|
||||||
[archiver.hyperkitty]
|
|
||||||
class: hyperkitty.archiver.Archiver
|
|
||||||
enable: yes
|
|
||||||
configuration: /etc/mailman.d/hyperkitty.cfg
|
|
||||||
|
|
||||||
#[archiver.prototype]
|
|
||||||
#enable: yes
|
|
|
@ -1,4 +1,3 @@
|
||||||
*:*:mailman:mailman:{{ lists_dev_mm_db_pass }}
|
*:*:mailman:mailmanadmin:{{ lists_dev_mm_db_pass }}
|
||||||
*:*:hyperkitty:hyperkitty:{{ lists_dev_hk_db_pass }}
|
*:*:hyperkitty:hyperkittyadmin:{{ lists_dev_hk_db_pass }}
|
||||||
*:*:kittystore:kittystore:{{ lists_dev_ks_db_pass }}
|
*:*:kittystore:kittystoreadmin:{{ lists_dev_ks_db_pass }}
|
||||||
*:*:postorius:postorius:{{ lists_dev_ps_db_pass }}
|
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
#Alias /robots.txt /var/lib/postorius/sites/default/static/robots.txt
|
|
||||||
#Alias /favicon.ico /var/lib/postorius/sites/default/static/favicon.ico
|
|
||||||
Alias /postorius/static /var/lib/postorius/sites/default/static
|
|
||||||
|
|
||||||
#ErrorLog /var/log/httpd/postorius_error.log
|
|
||||||
#CustomLog /var/log/httpd/postorius_access.log combined
|
|
||||||
|
|
||||||
WSGIScriptAlias /postorius /etc/postorius/sites/default/srv/postorius.wsgi
|
|
||||||
WSGIDaemonProcess postorius threads=25 python-path=/etc/postorius/sites/default
|
|
||||||
# If using VirtualEnv
|
|
||||||
#WSGIDaemonProcess postorius threads=25 python-path=/etc/postorius/sites/default:/path/to/your/venv/lib/python2.X/site-packages
|
|
||||||
|
|
||||||
<Directory "/etc/postorius/sites/default/srv">
|
|
||||||
<Files postorius.wsgi>
|
|
||||||
Order deny,allow
|
|
||||||
Allow from all
|
|
||||||
Require all granted
|
|
||||||
</Files>
|
|
||||||
WSGIProcessGroup postorius
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
<Directory "/var/lib/postorius/sites/default/static">
|
|
||||||
Order deny,allow
|
|
||||||
Allow from all
|
|
||||||
Require all granted
|
|
||||||
</Directory>
|
|
|
@ -1,20 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"fields": {
|
|
||||||
"date_joined": "2013-04-10T10:25:49.996",
|
|
||||||
"email": "root@lists-dev.cloud.fedoraproject.org",
|
|
||||||
"first_name": "List Admin",
|
|
||||||
"groups": [],
|
|
||||||
"is_active": true,
|
|
||||||
"is_staff": true,
|
|
||||||
"is_superuser": true,
|
|
||||||
"last_login": "2013-04-10T10:25:49.996",
|
|
||||||
"last_name": "",
|
|
||||||
"password": "pbkdf2_sha256$10000$uXnbYx0visOx$yux8mAZ2H/sjyCEYBvO3JEtJ7dmWfNMnvekQjePbue0=",
|
|
||||||
"user_permissions": [],
|
|
||||||
"username": "listadmin"
|
|
||||||
},
|
|
||||||
"model": "auth.user",
|
|
||||||
"pk": 1
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,34 +0,0 @@
|
||||||
#-*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
"""
|
|
||||||
Django local settings for the postorious project.
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
DEBUG = True
|
|
||||||
TEMPLATE_DEBUG = DEBUG
|
|
||||||
|
|
||||||
ADMINS = ()
|
|
||||||
DATABASES = {
|
|
||||||
'default': {
|
|
||||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
|
||||||
'NAME': 'postorius',
|
|
||||||
'USER': 'postorius',
|
|
||||||
'PASSWORD': '{{ lists_dev_ps_db_pass }}',
|
|
||||||
'HOST': 'localhost',
|
|
||||||
'PORT': '',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# URL that handles the media served from STATIC_ROOT. Make sure to use a
|
|
||||||
STATIC_URL = '/postorius/static/'
|
|
||||||
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
|
|
||||||
MEDIA_URL = '/postorius/media/'
|
|
||||||
|
|
||||||
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
|
|
||||||
# trailing slash.
|
|
||||||
# Examples: "http://foo.com/media/", "/media/".
|
|
||||||
ADMIN_MEDIA_PREFIX = '/postorius/static/admin/'
|
|
||||||
|
|
||||||
# Make this unique, and don't share it with anybody.
|
|
||||||
SECRET_KEY = '$!-7^wl#wiifjbh)5@f7ji%x!vp7s1vwt26hxvixq0u0'
|
|
|
@ -1,38 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright (C) 1998-2012 by the Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# This file is part of Postorius.
|
|
||||||
#
|
|
||||||
# Postorius is free software: you can redistribute it and/or modify it under
|
|
||||||
# the terms of the GNU General Public License as published by the Free
|
|
||||||
# Software Foundation, either version 3 of the License, or (at your option)
|
|
||||||
# any later version.
|
|
||||||
#
|
|
||||||
# Postorius is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
# more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along with
|
|
||||||
# Postorius. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
import postorius
|
|
||||||
|
|
||||||
from django.conf.urls import *
|
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
# Uncomment the next two lines to enable the admin:
|
|
||||||
from django.contrib import admin
|
|
||||||
admin.autodiscover()
|
|
||||||
|
|
||||||
# Import mailman urls and set urlpatterns if you want to hook
|
|
||||||
# mailman_django into an existing django site.
|
|
||||||
# Otherwise set ROOT_URLCONF in settings.py to
|
|
||||||
# `mailman_django.urls`.
|
|
||||||
# from mailman_django import urls as mailman_urls
|
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
|
||||||
url(r'^$', 'postorius.views.list_index'),
|
|
||||||
url(r'', include('postorius.urls')),
|
|
||||||
url(r'', include('social_auth.urls')),
|
|
||||||
)
|
|
|
@ -42,10 +42,6 @@ config = dict(
|
||||||
"tcp://app05.%s:300%i" % (non_phx_suffix, i)
|
"tcp://app05.%s:300%i" % (non_phx_suffix, i)
|
||||||
for i in range(8)
|
for i in range(8)
|
||||||
],
|
],
|
||||||
"bodhi.app06": [
|
|
||||||
"tcp://app06.%s:300%i" % (non_phx_suffix, i)
|
|
||||||
for i in range(8)
|
|
||||||
],
|
|
||||||
"bodhi.app07": [
|
"bodhi.app07": [
|
||||||
"tcp://app07.%s:300%i" % (suffix, i)
|
"tcp://app07.%s:300%i" % (suffix, i)
|
||||||
for i in range(8)
|
for i in range(8)
|
||||||
|
|
|
@ -6,7 +6,6 @@ app_hosts = [
|
||||||
"app03.phx2.fedoraproject.org",
|
"app03.phx2.fedoraproject.org",
|
||||||
"app04.phx2.fedoraproject.org",
|
"app04.phx2.fedoraproject.org",
|
||||||
"app05.fedoraproject.org",
|
"app05.fedoraproject.org",
|
||||||
"app06.fedoraproject.org",
|
|
||||||
"app07.phx2.fedoraproject.org",
|
"app07.phx2.fedoraproject.org",
|
||||||
"app08.fedoraproject.org",
|
"app08.fedoraproject.org",
|
||||||
]
|
]
|
||||||
|
|
|
@ -29,6 +29,9 @@
|
||||||
- name: restart jenkins
|
- name: restart jenkins
|
||||||
action: service name=jenkins state=restarted
|
action: service name=jenkins state=restarted
|
||||||
|
|
||||||
|
- name: restart kojid
|
||||||
|
action: service name=kojid state=restarted
|
||||||
|
|
||||||
- name: restart libvirtd
|
- name: restart libvirtd
|
||||||
action: service name=libvirtd state=restarted
|
action: service name=libvirtd state=restarted
|
||||||
|
|
||||||
|
@ -79,3 +82,6 @@
|
||||||
|
|
||||||
- name: restart netapproute
|
- name: restart netapproute
|
||||||
action: command /etc/sysconfig/network-scripts/ifup-routes eth1
|
action: command /etc/sysconfig/network-scripts/ifup-routes eth1
|
||||||
|
|
||||||
|
- name: restart unbound
|
||||||
|
action: service name=unbound state=restarted
|
||||||
|
|
8
handlers/semanage.yml
Normal file
8
handlers/semanage.yml
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
- name: semanage dns80
|
||||||
|
command: /usr/sbin/semanage port -m -t dns_port_t -p tcp 80
|
||||||
|
|
||||||
|
- name: semanage dns443
|
||||||
|
command: /usr/sbin/semanage port -m -t dns_port_t -p tcp 443
|
||||||
|
|
||||||
|
- name: semanage dns8953
|
||||||
|
command: /usr/sbin/semanage port -a -t dns_port_t -p tcp 8953
|
|
@ -136,20 +136,21 @@ arm02-builder23.arm.fedoraproject.org
|
||||||
# These are in use as arm03-packager01-02
|
# These are in use as arm03-packager01-02
|
||||||
#arm03-builder08.arm.fedoraproject.org
|
#arm03-builder08.arm.fedoraproject.org
|
||||||
#arm03-builder09.arm.fedoraproject.org
|
#arm03-builder09.arm.fedoraproject.org
|
||||||
arm03-builder10.arm.fedoraproject.org
|
# These are off currently
|
||||||
arm03-builder11.arm.fedoraproject.org
|
#arm03-builder10.arm.fedoraproject.org
|
||||||
arm03-builder12.arm.fedoraproject.org
|
#arm03-builder11.arm.fedoraproject.org
|
||||||
arm03-builder13.arm.fedoraproject.org
|
#arm03-builder12.arm.fedoraproject.org
|
||||||
arm03-builder14.arm.fedoraproject.org
|
#arm03-builder13.arm.fedoraproject.org
|
||||||
arm03-builder15.arm.fedoraproject.org
|
#arm03-builder14.arm.fedoraproject.org
|
||||||
arm03-builder16.arm.fedoraproject.org
|
#arm03-builder15.arm.fedoraproject.org
|
||||||
arm03-builder17.arm.fedoraproject.org
|
#arm03-builder16.arm.fedoraproject.org
|
||||||
arm03-builder18.arm.fedoraproject.org
|
#arm03-builder17.arm.fedoraproject.org
|
||||||
arm03-builder19.arm.fedoraproject.org
|
#arm03-builder18.arm.fedoraproject.org
|
||||||
arm03-builder20.arm.fedoraproject.org
|
#arm03-builder19.arm.fedoraproject.org
|
||||||
arm03-builder21.arm.fedoraproject.org
|
#arm03-builder20.arm.fedoraproject.org
|
||||||
arm03-builder22.arm.fedoraproject.org
|
#arm03-builder21.arm.fedoraproject.org
|
||||||
arm03-builder23.arm.fedoraproject.org
|
#arm03-builder22.arm.fedoraproject.org
|
||||||
|
#arm03-builder23.arm.fedoraproject.org
|
||||||
|
|
||||||
[arm04]
|
[arm04]
|
||||||
arm04-builder00.arm.fedoraproject.org
|
arm04-builder00.arm.fedoraproject.org
|
||||||
|
|
18
inventory/group_vars/ask
Normal file
18
inventory/group_vars/ask
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
---
|
||||||
|
# Define resources for this group of hosts here.
|
||||||
|
lvm_size: 20000
|
||||||
|
mem_size: 2048
|
||||||
|
num_cpus: 2
|
||||||
|
|
||||||
|
tcp_ports: [ 443 ]
|
||||||
|
|
||||||
|
fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice
|
||||||
|
|
||||||
|
# These are consumed by a task in roles/fedmsg_base/main.yml
|
||||||
|
fedmsg_certs:
|
||||||
|
- service: shell
|
||||||
|
owner: root
|
||||||
|
group: sysadmin
|
||||||
|
- service: askbot
|
||||||
|
owner: root
|
||||||
|
group: apache
|
|
@ -7,3 +7,12 @@ num_cpus: 2
|
||||||
tcp_ports: [ 443 ]
|
tcp_ports: [ 443 ]
|
||||||
|
|
||||||
fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice
|
fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice
|
||||||
|
|
||||||
|
# These are consumed by a task in roles/fedmsg_base/main.yml
|
||||||
|
fedmsg_certs:
|
||||||
|
- service: shell
|
||||||
|
owner: root
|
||||||
|
group: sysadmin
|
||||||
|
- service: askbot
|
||||||
|
owner: root
|
||||||
|
group: apache
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
lvm_size: 150000
|
lvm_size: 150000
|
||||||
mem_size: 6144
|
mem_size: 6144
|
||||||
num_cpus: 5
|
num_cpus: 5
|
||||||
ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora
|
ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-20
|
||||||
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/19/Fedora/x86_64/os/
|
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/
|
||||||
nm: 255.255.255.0
|
nm: 255.255.255.0
|
||||||
gw: 10.5.125.254
|
gw: 10.5.125.254
|
||||||
eth1_gw: 10.5.127.254
|
eth1_gw: 10.5.127.254
|
||||||
|
|
|
@ -6,4 +6,4 @@ num_cpus: 1
|
||||||
# the host_vars/$hostname file
|
# the host_vars/$hostname file
|
||||||
|
|
||||||
tcp_ports: [ 873 ]
|
tcp_ports: [ 873 ]
|
||||||
fas_client_groups: sysadmin-noc
|
fas_client_groups: sysadmin-noc,sysadmin-docs
|
||||||
|
|
12
inventory/group_vars/fedoauth
Normal file
12
inventory/group_vars/fedoauth
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
---
|
||||||
|
# Define resources for this group of hosts here.
|
||||||
|
lvm_size: 20000
|
||||||
|
mem_size: 1024
|
||||||
|
num_cpus: 2
|
||||||
|
|
||||||
|
# for systems that do not match the above - specify the same parameter in
|
||||||
|
# the host_vars/$hostname file
|
||||||
|
|
||||||
|
tcp_ports: [ 80, 443 ]
|
||||||
|
|
||||||
|
fas_client_groups: sysadmin-main,sysadmin-accounts
|
12
inventory/group_vars/fedoauth-stg
Normal file
12
inventory/group_vars/fedoauth-stg
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
---
|
||||||
|
# Define resources for this group of hosts here.
|
||||||
|
lvm_size: 20000
|
||||||
|
mem_size: 1024
|
||||||
|
num_cpus: 2
|
||||||
|
|
||||||
|
# for systems that do not match the above - specify the same parameter in
|
||||||
|
# the host_vars/$hostname file
|
||||||
|
|
||||||
|
tcp_ports: [ 80, 443 ]
|
||||||
|
|
||||||
|
fas_client_groups: sysadmin-main,sysadmin-accounts
|
|
@ -1,6 +1,5 @@
|
||||||
---
|
---
|
||||||
freezes: true
|
freezes: true
|
||||||
resolvconf: "{{ files }}/resolv.conf/phx2"
|
resolvconf: "{{ files }}/resolv.conf/phx2"
|
||||||
rsyslogconf: "{{ files }}/rsyslog/rsyslog.conf.phx2"
|
|
||||||
fas_client_groups: sysadmin-kernel
|
fas_client_groups: sysadmin-kernel
|
||||||
sudoers: "{{ private }}/files/sudo/kernel-qa"
|
sudoers: "{{ private }}/files/sudo/kernel-qa"
|
||||||
|
|
9
inventory/group_vars/lockbox
Normal file
9
inventory/group_vars/lockbox
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
---
|
||||||
|
# Define resources for this group of hosts here.
|
||||||
|
lvm_size: 20000
|
||||||
|
mem_size: 2048
|
||||||
|
num_cpus: 2
|
||||||
|
|
||||||
|
tcp_ports: [ 443 ]
|
||||||
|
|
||||||
|
fas_client_groups: sysadmin-noc,sysadmin-qa,fi-apprentice
|
32
inventory/group_vars/mailman
Normal file
32
inventory/group_vars/mailman
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
---
|
||||||
|
# common items for the releng-* boxes
|
||||||
|
lvm_size: 250000
|
||||||
|
mem_size: 4096
|
||||||
|
num_cpus: 2
|
||||||
|
# for systems that do not match the above - specify the same parameter in
|
||||||
|
# the host_vars/$hostname file
|
||||||
|
|
||||||
|
tcp_ports: [ 25, 80, 443 ]
|
||||||
|
fas_client_groups: sysadmin-tools,sysadmin-main
|
||||||
|
|
||||||
|
# These are consumed by a task in roles/fedmsg_base/main.yml
|
||||||
|
fedmsg_certs:
|
||||||
|
- service: shell
|
||||||
|
owner: root
|
||||||
|
group: sysadmin
|
||||||
|
- service: mailman
|
||||||
|
owner: mailman
|
||||||
|
group: mailman
|
||||||
|
|
||||||
|
# default virt install command is for a single nic-device
|
||||||
|
# define in another group file for more nics (see buildvm)
|
||||||
|
virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
|
||||||
|
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
|
||||||
|
--vcpus={{ num_cpus }} -l {{ ks_repo }} -x
|
||||||
|
"ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
|
||||||
|
gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
|
||||||
|
hostname={{ inventory_hostname }}"
|
||||||
|
--network=bridge=br0 --autostart --noautoconsole
|
||||||
|
|
||||||
|
# Used by the mailman role
|
||||||
|
mailman_dbserver: db01.phx2.fedoraproject.org
|
|
@ -27,3 +27,6 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
|
||||||
gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
|
gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
|
||||||
hostname={{ inventory_hostname }}"
|
hostname={{ inventory_hostname }}"
|
||||||
--network=bridge=br0 --autostart --noautoconsole
|
--network=bridge=br0 --autostart --noautoconsole
|
||||||
|
|
||||||
|
# Used by the mailman role
|
||||||
|
mailman_dbserver: db02.stg.phx2.fedoraproject.org
|
||||||
|
|
10
inventory/group_vars/notifs-backend
Normal file
10
inventory/group_vars/notifs-backend
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
# Define resources for this group of hosts here.
|
||||||
|
lvm_size: 20000
|
||||||
|
mem_size: 1024
|
||||||
|
num_cpus: 2
|
||||||
|
|
||||||
|
# for systems that do not match the above - specify the same parameter in
|
||||||
|
# the host_vars/$hostname file
|
||||||
|
|
||||||
|
fas_client_groups: sysadmin-noc,sysadmin-datanommer
|
12
inventory/group_vars/notifs-web
Normal file
12
inventory/group_vars/notifs-web
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
---
|
||||||
|
# Define resources for this group of hosts here.
|
||||||
|
lvm_size: 20000
|
||||||
|
mem_size: 1024
|
||||||
|
num_cpus: 2
|
||||||
|
|
||||||
|
# for systems that do not match the above - specify the same parameter in
|
||||||
|
# the host_vars/$hostname file
|
||||||
|
|
||||||
|
tcp_ports: [ 80, 443 ]
|
||||||
|
|
||||||
|
fas_client_groups: sysadmin-noc,sysadmin-datanommer
|
|
@ -8,6 +8,8 @@ num_cpus: 2
|
||||||
# the host_vars/$hostname file
|
# the host_vars/$hostname file
|
||||||
|
|
||||||
tcp_ports: [ 80, 443,
|
tcp_ports: [ 80, 443,
|
||||||
|
# This port is required by gluster
|
||||||
|
6996,
|
||||||
# These 16 ports are used by fedmsg. One for each wsgi thread.
|
# These 16 ports are used by fedmsg. One for each wsgi thread.
|
||||||
3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
|
3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
|
||||||
3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
|
3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
|
||||||
|
|
|
@ -8,6 +8,8 @@ num_cpus: 2
|
||||||
# the host_vars/$hostname file
|
# the host_vars/$hostname file
|
||||||
|
|
||||||
tcp_ports: [ 80, 443,
|
tcp_ports: [ 80, 443,
|
||||||
|
# This port is required by gluster
|
||||||
|
6996,
|
||||||
# These 16 ports are used by fedmsg. One for each wsgi thread.
|
# These 16 ports are used by fedmsg. One for each wsgi thread.
|
||||||
3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
|
3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
|
||||||
3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
|
3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
|
||||||
|
|
9
inventory/group_vars/unbound
Normal file
9
inventory/group_vars/unbound
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
---
|
||||||
|
lvm_size: 10000
|
||||||
|
mem_size: 1024
|
||||||
|
num_cpus: 2
|
||||||
|
|
||||||
|
tcp_ports: [ 80, 443 ]
|
||||||
|
custom_rules: [ '-A INPUT -p tcp -m tcp -s 209.132.184.0/24 --dport 53 -j ACCEPT', '-A INPUT -p udp -m udp -s 209.132.184.0/24 --dport 53 -j ACCEPT' ]
|
||||||
|
|
||||||
|
fas_client_groups: sysadmin-dns
|
10
inventory/host_vars/ask01.phx2.fedoraproject.org
Normal file
10
inventory/host_vars/ask01.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
|
volgroup: /dev/vg_guests00
|
||||||
|
eth0_ip: 10.5.126.79
|
||||||
|
vmhost: virthost06.phx2.fedoraproject.org
|
||||||
|
datacenter: phx2
|
10
inventory/host_vars/ask02.phx2.fedoraproject.org
Normal file
10
inventory/host_vars/ask02.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
|
volgroup: /dev/vg_guests00
|
||||||
|
eth0_ip: 10.5.126.57
|
||||||
|
vmhost: virthost14.phx2.fedoraproject.org
|
||||||
|
datacenter: phx2
|
|
@ -4,7 +4,7 @@ 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-rhel-6
|
||||||
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
volgroup: /dev/VirtGuests00
|
volgroup: /dev/vg_guests00
|
||||||
eth0_ip: 10.5.126.102
|
eth0_ip: 10.5.126.102
|
||||||
vmhost: virthost01.phx2.fedoraproject.org
|
vmhost: virthost15.phx2.fedoraproject.org
|
||||||
datacenter: phx2
|
datacenter: phx2
|
||||||
|
|
11
inventory/host_vars/bodhi.dev.fedoraproject.org
Normal file
11
inventory/host_vars/bodhi.dev.fedoraproject.org
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
---
|
||||||
|
instance_type: m1.medium
|
||||||
|
image: "{{ el6_qcow_id }}"
|
||||||
|
keypair: fedora-admin-20130801
|
||||||
|
security_group: webserver
|
||||||
|
zone: nova
|
||||||
|
hostbase: bodhi.dev
|
||||||
|
public_ip: 209.132.184.215
|
||||||
|
root_auth_users: lmacken
|
||||||
|
description: bodhi2 dev instance
|
||||||
|
tcp_ports: ['22', '443']
|
10
inventory/host_vars/fedoauth01.phx2.fedoraproject.org
Normal file
10
inventory/host_vars/fedoauth01.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
|
volgroup: /dev/vg_guests00
|
||||||
|
eth0_ip: 10.5.126.240
|
||||||
|
vmhost: virthost07.phx2.fedoraproject.org
|
||||||
|
datacenter: phx2
|
10
inventory/host_vars/fedoauth01.stg.phx2.fedoraproject.org
Normal file
10
inventory/host_vars/fedoauth01.stg.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
|
volgroup: /dev/vg_guests
|
||||||
|
eth0_ip: 10.5.126.28
|
||||||
|
vmhost: virthost12.phx2.fedoraproject.org
|
||||||
|
datacenter: phx2
|
10
inventory/host_vars/fedoauth02.phx2.fedoraproject.org
Normal file
10
inventory/host_vars/fedoauth02.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
|
volgroup: /dev/vg_guests
|
||||||
|
eth0_ip: 10.5.126.241
|
||||||
|
vmhost: virthost09.phx2.fedoraproject.org
|
||||||
|
datacenter: phx2
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
instance_type: m1.small
|
instance_type: m1.large
|
||||||
image: "{{ f18_qcow_id }}"
|
image: "{{ f19_qcow_id }}"
|
||||||
keypair: fedora-admin-20130801
|
keypair: fedora-admin-20130801
|
||||||
security_group: smtpserver
|
security_group: smtpserver
|
||||||
zone: nova
|
zone: nova
|
||||||
|
|
10
inventory/host_vars/lockbox-comm01.qa.fedoraproject.org
Normal file
10
inventory/host_vars/lockbox-comm01.qa.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.124.254
|
||||||
|
dns: 10.5.124.21
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
|
volgroup: /dev/Guests00
|
||||||
|
eth0_ip: 10.5.124.210
|
||||||
|
vmhost: virthost-comm01.qa.fedoraproject.org
|
||||||
|
datacenter: phx2
|
10
inventory/host_vars/mailman01.phx2.fedoraproject.org
Normal file
10
inventory/host_vars/mailman01.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-19
|
||||||
|
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/19/Fedora/x86_64/os/
|
||||||
|
volgroup: /dev/vg_guests
|
||||||
|
eth0_ip: 10.5.126.36
|
||||||
|
vmhost: virthost08.phx2.fedoraproject.org
|
||||||
|
datacenter: phx2
|
10
inventory/host_vars/mailman02.phx2.fedoraproject.org
Normal file
10
inventory/host_vars/mailman02.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-19
|
||||||
|
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/19/Fedora/x86_64/os/
|
||||||
|
volgroup: /dev/vg_guests00
|
||||||
|
eth0_ip: 10.5.126.37
|
||||||
|
vmhost: virthost07.phx2.fedoraproject.org
|
||||||
|
datacenter: phx2
|
14
inventory/host_vars/notifs-backend01.phx2.fedoraproject.org
Normal file
14
inventory/host_vars/notifs-backend01.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
|
|
||||||
|
eth0_ip: 10.5.126.168
|
||||||
|
|
||||||
|
volgroup: /dev/vg_virthost09
|
||||||
|
vmhost: virthost09.phx2.fedoraproject.org
|
||||||
|
|
||||||
|
datacenter: phx2
|
14
inventory/host_vars/notifs-web01.phx2.fedoraproject.org
Normal file
14
inventory/host_vars/notifs-web01.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
|
|
||||||
|
eth0_ip: 10.5.126.103
|
||||||
|
|
||||||
|
volgroup: /dev/vg_virthost04
|
||||||
|
vmhost: virthost04.phx2.fedoraproject.org
|
||||||
|
|
||||||
|
datacenter: phx2
|
14
inventory/host_vars/notifs-web02.phx2.fedoraproject.org
Normal file
14
inventory/host_vars/notifs-web02.phx2.fedoraproject.org
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.0
|
||||||
|
gw: 10.5.126.254
|
||||||
|
dns: 10.5.126.21
|
||||||
|
|
||||||
|
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
|
||||||
|
|
||||||
|
eth0_ip: 10.5.126.119
|
||||||
|
|
||||||
|
volgroup: /dev/vg_virthost06
|
||||||
|
vmhost: virthost06.phx2.fedoraproject.org
|
||||||
|
|
||||||
|
datacenter: phx2
|
|
@ -1,3 +1,8 @@
|
||||||
vmhost: bvirthost05.phx2.fedoraproject.org
|
vmhost: buildvmhost-12.phx2.fedoraproject.org
|
||||||
eth0_ip: 10.5.125.69
|
eth0_ip: 10.5.125.69
|
||||||
volgroup: /dev/xenGuests
|
volgroup: /dev/xenGuests
|
||||||
|
mem_size: 65536
|
||||||
|
num_cpus: 16
|
||||||
|
# With 16 cpus, theres a bunch more kernel threads
|
||||||
|
nrpe_procs_warn: 900
|
||||||
|
nrpe_procs_crit: 1000
|
||||||
|
|
10
inventory/host_vars/unbound-ib01.fedoraproject.org
Normal file
10
inventory/host_vars/unbound-ib01.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.128
|
||||||
|
gw: 152.19.134.129
|
||||||
|
dns: 152.2.21.1
|
||||||
|
ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-x86_64/
|
||||||
|
volgroup: /dev/ibiblio01_vg
|
||||||
|
eth0_ip: 152.19.134.150
|
||||||
|
vmhost: ibiblio01.fedoraproject.org
|
||||||
|
datacenter: ibiblio
|
10
inventory/host_vars/unbound-telia01.fedoraproject.org
Normal file
10
inventory/host_vars/unbound-telia01.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.240
|
||||||
|
gw: 80.239.156.209
|
||||||
|
dns: 213.248.76.210
|
||||||
|
ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-x86_64/
|
||||||
|
volgroup: /dev/VolGroup00
|
||||||
|
eth0_ip: 80.239.156.220
|
||||||
|
vmhost: telia01.fedoraproject.org
|
||||||
|
datacenter: telia
|
10
inventory/host_vars/unbound-tummy01.fedoraproject.org
Normal file
10
inventory/host_vars/unbound-tummy01.fedoraproject.org
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
nm: 255.255.255.240
|
||||||
|
gw: 66.35.62.174
|
||||||
|
dns: 198.49.126.1 66.35.36.133
|
||||||
|
ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6
|
||||||
|
ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-x86_64/
|
||||||
|
volgroup: /dev/VolGroup00
|
||||||
|
eth0_ip: 66.35.62.163
|
||||||
|
vmhost: tummy01.fedoraproject.org
|
||||||
|
datacenter: tummy
|
|
@ -29,7 +29,6 @@ app02.phx2.fedoraproject.org
|
||||||
app03.phx2.fedoraproject.org
|
app03.phx2.fedoraproject.org
|
||||||
app04.phx2.fedoraproject.org
|
app04.phx2.fedoraproject.org
|
||||||
app05.fedoraproject.org
|
app05.fedoraproject.org
|
||||||
app06.fedoraproject.org
|
|
||||||
app08.fedoraproject.org
|
app08.fedoraproject.org
|
||||||
|
|
||||||
[app-stg]
|
[app-stg]
|
||||||
|
@ -146,6 +145,10 @@ fedocal01.stg.phx2.fedoraproject.org
|
||||||
[gallery-stg]
|
[gallery-stg]
|
||||||
gallery01.stg.phx2.fedoraproject.org
|
gallery01.stg.phx2.fedoraproject.org
|
||||||
|
|
||||||
|
[mailman]
|
||||||
|
mailman01.phx2.fedoraproject.org
|
||||||
|
mailman02.phx2.fedoraproject.org
|
||||||
|
|
||||||
[mailman-stg]
|
[mailman-stg]
|
||||||
mailman01.stg.phx2.fedoraproject.org
|
mailman01.stg.phx2.fedoraproject.org
|
||||||
|
|
||||||
|
@ -154,7 +157,7 @@ collab03.fedoraproject.org
|
||||||
collab04.fedoraproject.org
|
collab04.fedoraproject.org
|
||||||
|
|
||||||
[releng]
|
[releng]
|
||||||
releng01.phx2.fedoraproject.org
|
#releng01.phx2.fedoraproject.org
|
||||||
releng02.phx2.fedoraproject.org
|
releng02.phx2.fedoraproject.org
|
||||||
releng04.phx2.fedoraproject.org
|
releng04.phx2.fedoraproject.org
|
||||||
relepel01.phx2.fedoraproject.org
|
relepel01.phx2.fedoraproject.org
|
||||||
|
@ -247,13 +250,23 @@ dhcp01.phx2.fedoraproject.org
|
||||||
noc01.phx2.fedoraproject.org
|
noc01.phx2.fedoraproject.org
|
||||||
noc02.fedoraproject.org
|
noc02.fedoraproject.org
|
||||||
|
|
||||||
|
[lockbox]
|
||||||
|
lockbox-comm01.qa.fedoraproject.org
|
||||||
|
|
||||||
[nagios]
|
[nagios]
|
||||||
noc01.phx2.fedoraproject.org
|
noc01.phx2.fedoraproject.org
|
||||||
noc02.fedoraproject.org
|
noc02.fedoraproject.org
|
||||||
|
|
||||||
|
[notifs-backend]
|
||||||
|
notifs-backend01.phx2.fedoraproject.org
|
||||||
|
|
||||||
[notifs-backend-stg]
|
[notifs-backend-stg]
|
||||||
notifs-backend01.stg.phx2.fedoraproject.org
|
notifs-backend01.stg.phx2.fedoraproject.org
|
||||||
|
|
||||||
|
[notifs-web]
|
||||||
|
notifs-web01.phx2.fedoraproject.org
|
||||||
|
notifs-web02.phx2.fedoraproject.org
|
||||||
|
|
||||||
[notifs-web-stg]
|
[notifs-web-stg]
|
||||||
notifs-web01.stg.phx2.fedoraproject.org
|
notifs-web01.stg.phx2.fedoraproject.org
|
||||||
notifs-web02.stg.phx2.fedoraproject.org
|
notifs-web02.stg.phx2.fedoraproject.org
|
||||||
|
@ -269,6 +282,13 @@ nuancier02.stg.phx2.fedoraproject.org
|
||||||
[fedocal-stg]
|
[fedocal-stg]
|
||||||
fedocal01.stg.phx2.fedoraproject.org
|
fedocal01.stg.phx2.fedoraproject.org
|
||||||
|
|
||||||
|
[fedoauth]
|
||||||
|
fedoauth01.phx2.fedoraproject.org
|
||||||
|
fedoauth02.phx2.fedoraproject.org
|
||||||
|
|
||||||
|
[fedoauth-stg]
|
||||||
|
fedoauth01.stg.phx2.fedoraproject.org
|
||||||
|
|
||||||
[memcached]
|
[memcached]
|
||||||
memcached03.phx2.fedoraproject.org
|
memcached03.phx2.fedoraproject.org
|
||||||
memcached04.phx2.fedoraproject.org
|
memcached04.phx2.fedoraproject.org
|
||||||
|
@ -283,7 +303,6 @@ openid01.phx2.fedoraproject.org
|
||||||
openid02.phx2.fedoraproject.org
|
openid02.phx2.fedoraproject.org
|
||||||
|
|
||||||
[other]
|
[other]
|
||||||
mm3test.fedoraproject.org
|
|
||||||
people03.fedoraproject.org
|
people03.fedoraproject.org
|
||||||
survey01.dev.fedoraproject.org
|
survey01.dev.fedoraproject.org
|
||||||
secondary01.phx2.fedoraproject.org
|
secondary01.phx2.fedoraproject.org
|
||||||
|
@ -326,7 +345,6 @@ proxy01.phx2.fedoraproject.org
|
||||||
proxy02.fedoraproject.org
|
proxy02.fedoraproject.org
|
||||||
proxy03.fedoraproject.org
|
proxy03.fedoraproject.org
|
||||||
proxy04.fedoraproject.org
|
proxy04.fedoraproject.org
|
||||||
proxy05.fedoraproject.org
|
|
||||||
proxy06.fedoraproject.org
|
proxy06.fedoraproject.org
|
||||||
proxy07.fedoraproject.org
|
proxy07.fedoraproject.org
|
||||||
proxy08.fedoraproject.org
|
proxy08.fedoraproject.org
|
||||||
|
@ -354,6 +372,7 @@ db02.stg.phx2.fedoraproject.org
|
||||||
db-fas01.stg.phx2.fedoraproject.org
|
db-fas01.stg.phx2.fedoraproject.org
|
||||||
elections01.stg.phx2.fedoraproject.org
|
elections01.stg.phx2.fedoraproject.org
|
||||||
fas01.stg.phx2.fedoraproject.org
|
fas01.stg.phx2.fedoraproject.org
|
||||||
|
fedoauth01.stg.phx2.fedoraproject.org
|
||||||
fedocal01.stg.phx2.fedoraproject.org
|
fedocal01.stg.phx2.fedoraproject.org
|
||||||
fedocal01.stg.phx2.fedoraproject.org
|
fedocal01.stg.phx2.fedoraproject.org
|
||||||
koji01.stg.phx2.fedoraproject.org
|
koji01.stg.phx2.fedoraproject.org
|
||||||
|
@ -363,7 +382,6 @@ notifs-web01.stg.phx2.fedoraproject.org
|
||||||
notifs-web02.stg.phx2.fedoraproject.org
|
notifs-web02.stg.phx2.fedoraproject.org
|
||||||
nuancier01.stg.phx2.fedoraproject.org
|
nuancier01.stg.phx2.fedoraproject.org
|
||||||
nuancier02.stg.phx2.fedoraproject.org
|
nuancier02.stg.phx2.fedoraproject.org
|
||||||
openid01.stg.phx2.fedoraproject.org
|
|
||||||
packages01.stg.phx2.fedoraproject.org
|
packages01.stg.phx2.fedoraproject.org
|
||||||
paste01.stg.phx2.fedoraproject.org
|
paste01.stg.phx2.fedoraproject.org
|
||||||
pkgs01.stg.phx2.fedoraproject.org
|
pkgs01.stg.phx2.fedoraproject.org
|
||||||
|
@ -374,7 +392,7 @@ value01.stg.phx2.fedoraproject.org
|
||||||
[taskotron]
|
[taskotron]
|
||||||
taskotron-dev01.qa.fedoraproject.org
|
taskotron-dev01.qa.fedoraproject.org
|
||||||
|
|
||||||
[unbound-dns]
|
[unbound]
|
||||||
unbound-ib01.fedoraproject.org
|
unbound-ib01.fedoraproject.org
|
||||||
unbound-telia01.fedoraproject.org
|
unbound-telia01.fedoraproject.org
|
||||||
unbound-tummy01.fedoraproject.org
|
unbound-tummy01.fedoraproject.org
|
||||||
|
@ -386,9 +404,9 @@ value03.phx2.fedoraproject.org
|
||||||
value01.stg.phx2.fedoraproject.org
|
value01.stg.phx2.fedoraproject.org
|
||||||
|
|
||||||
[virthost]
|
[virthost]
|
||||||
virthost01.phx2.fedoraproject.org
|
#virthost01.phx2.fedoraproject.org
|
||||||
virthost02.phx2.fedoraproject.org
|
virthost02.phx2.fedoraproject.org
|
||||||
virthost03.phx2.fedoraproject.org
|
#virthost03.phx2.fedoraproject.org
|
||||||
virthost04.phx2.fedoraproject.org
|
virthost04.phx2.fedoraproject.org
|
||||||
virthost05.phx2.fedoraproject.org
|
virthost05.phx2.fedoraproject.org
|
||||||
virthost06.phx2.fedoraproject.org
|
virthost06.phx2.fedoraproject.org
|
||||||
|
@ -424,7 +442,8 @@ copr-fe-dev.cloud.fedoraproject.org
|
||||||
hrf.cloud.fedoraproject.org
|
hrf.cloud.fedoraproject.org
|
||||||
#shogun-ca.cloud.fedoraproject.org
|
#shogun-ca.cloud.fedoraproject.org
|
||||||
209.132.184.157
|
209.132.184.157
|
||||||
|
# bodhi.dev.fedoraproject.org
|
||||||
|
bodhi.dev.fedoraproject.org
|
||||||
|
|
||||||
[cloud]
|
[cloud]
|
||||||
jenkins-slaves
|
jenkins-slaves
|
||||||
|
@ -490,7 +509,7 @@ colo-virt
|
||||||
[groupc:children]
|
[groupc:children]
|
||||||
value
|
value
|
||||||
qa
|
qa
|
||||||
unbound-dns
|
unbound
|
||||||
dev
|
dev
|
||||||
staging
|
staging
|
||||||
builders
|
builders
|
||||||
|
|
|
@ -31,9 +31,10 @@
|
||||||
tasks:
|
tasks:
|
||||||
- name: growpart /dev/vda1 partition (/) to full size
|
- name: growpart /dev/vda1 partition (/) to full size
|
||||||
action: command growpart /dev/vda 1
|
action: command growpart /dev/vda 1
|
||||||
ignore_errors: true
|
|
||||||
register: growpart
|
register: growpart
|
||||||
|
always_run: true
|
||||||
changed_when: "growpart.rc != 1"
|
changed_when: "growpart.rc != 1"
|
||||||
|
failed_when: growpart.rc == 2
|
||||||
|
|
||||||
- name: resize the /dev/vda 1 fs
|
- name: resize the /dev/vda 1 fs
|
||||||
action: command resize2fs /dev/vda1
|
action: command resize2fs /dev/vda1
|
||||||
|
|
|
@ -31,9 +31,10 @@
|
||||||
tasks:
|
tasks:
|
||||||
- name: growpart /dev/vda1 partition (/) to full size
|
- name: growpart /dev/vda1 partition (/) to full size
|
||||||
action: command growpart /dev/vda 1
|
action: command growpart /dev/vda 1
|
||||||
ignore_errors: true
|
|
||||||
register: growpart
|
register: growpart
|
||||||
|
always_run: true
|
||||||
changed_when: "growpart.rc != 1"
|
changed_when: "growpart.rc != 1"
|
||||||
|
failed_when: growpart.rc == 2
|
||||||
|
|
||||||
- name: resize the /dev/vda 1 fs
|
- name: resize the /dev/vda 1 fs
|
||||||
action: command resize2fs /dev/vda1
|
action: command resize2fs /dev/vda1
|
||||||
|
|
|
@ -12,10 +12,10 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/base
|
- base
|
||||||
- /srv/web/infra/ansible/roles/rkhunter
|
- rkhunter
|
||||||
- /srv/web/infra/ansible/roles/denyhosts
|
- denyhosts
|
||||||
- /srv/web/infra/ansible/roles/fas_client
|
- fas_client
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
# this is how you include other task lists
|
# this is how you include other task lists
|
||||||
|
|
|
@ -12,10 +12,10 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/base
|
- base
|
||||||
- /srv/web/infra/ansible/roles/rkhunter
|
- rkhunter
|
||||||
- /srv/web/infra/ansible/roles/denyhosts
|
- denyhosts
|
||||||
- /srv/web/infra/ansible/roles/fas_client
|
- fas_client
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
# this is how you include other task lists
|
# this is how you include other task lists
|
||||||
|
|
|
@ -12,11 +12,11 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/base
|
- base
|
||||||
- /srv/web/infra/ansible/roles/fas_client
|
- fas_client
|
||||||
- /srv/web/infra/ansible/roles/rkhunter
|
- rkhunter
|
||||||
- /srv/web/infra/ansible/roles/denyhosts
|
- denyhosts
|
||||||
- /srv/web/infra/ansible/roles/nagios_client
|
- nagios_client
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
# this is how you include other task lists
|
# this is how you include other task lists
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
- name: make ask
|
- name: make ask
|
||||||
hosts: ask-stg
|
hosts: ask-stg:ask
|
||||||
user: root
|
user: root
|
||||||
gather_facts: False
|
gather_facts: False
|
||||||
accelerate: True
|
accelerate: True
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
- include: "{{ handlers }}/restart_services.yml"
|
- include: "{{ handlers }}/restart_services.yml"
|
||||||
|
|
||||||
- name: make the box be real
|
- name: make the box be real
|
||||||
hosts: ask-stg
|
hosts: ask-stg:ask
|
||||||
user: root
|
user: root
|
||||||
gather_facts: True
|
gather_facts: True
|
||||||
accelerate: True
|
accelerate: True
|
||||||
|
@ -28,12 +28,13 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/base
|
- base
|
||||||
- /srv/web/infra/ansible/roles/rkhunter
|
- rkhunter
|
||||||
- /srv/web/infra/ansible/roles/denyhosts
|
- denyhosts
|
||||||
- /srv/web/infra/ansible/roles/nagios_client
|
- nagios_client
|
||||||
- /srv/web/infra/ansible/roles/fas_client
|
- fas_client
|
||||||
- /srv/web/infra/ansible/roles/ask
|
- ask
|
||||||
|
- fedmsg_base
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- include: "{{ tasks }}/hosts.yml"
|
- include: "{{ tasks }}/hosts.yml"
|
||||||
|
|
|
@ -15,11 +15,11 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/base
|
- base
|
||||||
- /srv/web/infra/ansible/roles/rkhunter
|
- rkhunter
|
||||||
- /srv/web/infra/ansible/roles/denyhosts
|
- denyhosts
|
||||||
- /srv/web/infra/ansible/roles/nagios_client
|
- nagios_client
|
||||||
- /srv/web/infra/ansible/roles/fas_client
|
- fas_client
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- include: "{{ tasks }}/hosts.yml"
|
- include: "{{ tasks }}/hosts.yml"
|
||||||
|
|
|
@ -32,12 +32,12 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/base
|
- base
|
||||||
- /srv/web/infra/ansible/roles/rkhunter
|
- rkhunter
|
||||||
- /srv/web/infra/ansible/roles/denyhosts
|
- denyhosts
|
||||||
- /srv/web/infra/ansible/roles/nagios_client
|
- nagios_client
|
||||||
- /srv/web/infra/ansible/roles/fas_client
|
- fas_client
|
||||||
- /srv/web/infra/ansible/roles/fedmsg_base
|
- fedmsg_base
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- include: "{{ tasks }}/hosts.yml"
|
- include: "{{ tasks }}/hosts.yml"
|
||||||
|
@ -58,8 +58,8 @@
|
||||||
accelerate: True
|
accelerate: True
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/fedmsg-hub
|
- fedmsg-hub
|
||||||
- /srv/web/infra/ansible/roles/badges-backend
|
- badges-backend
|
||||||
|
|
||||||
vars_files:
|
vars_files:
|
||||||
- /srv/web/infra/ansible/vars/global.yml
|
- /srv/web/infra/ansible/vars/global.yml
|
||||||
|
|
|
@ -32,13 +32,13 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/base
|
- base
|
||||||
- /srv/web/infra/ansible/roles/rkhunter
|
- rkhunter
|
||||||
- /srv/web/infra/ansible/roles/denyhosts
|
- denyhosts
|
||||||
- /srv/web/infra/ansible/roles/nagios_client
|
- nagios_client
|
||||||
- /srv/web/infra/ansible/roles/fas_client
|
- fas_client
|
||||||
- /srv/web/infra/ansible/roles/badges-frontend
|
- badges-frontend
|
||||||
- /srv/web/infra/ansible/roles/fedmsg_base
|
- fedmsg_base
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- include: "{{ tasks }}/hosts.yml"
|
- include: "{{ tasks }}/hosts.yml"
|
||||||
|
|
|
@ -29,11 +29,11 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/base
|
- base
|
||||||
- /srv/web/infra/ansible/roles/rkhunter
|
- rkhunter
|
||||||
- /srv/web/infra/ansible/roles/denyhosts
|
- denyhosts
|
||||||
- /srv/web/infra/ansible/roles/nagios_client
|
- nagios_client
|
||||||
- /srv/web/infra/ansible/roles/fas_client
|
- fas_client
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
# this is how you include other task lists
|
# this is how you include other task lists
|
||||||
|
|
|
@ -13,10 +13,10 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- /srv/web/infra/ansible/roles/base
|
- base
|
||||||
|
- koji_builder
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- include: "{{ tasks }}/koji/base_builder.yml"
|
|
||||||
- include: "{{ tasks }}/koji/builder_kernel_config.yml"
|
- include: "{{ tasks }}/koji/builder_kernel_config.yml"
|
||||||
- include: "{{ tasks }}/koji/bkernel-setup.yml"
|
- include: "{{ tasks }}/koji/bkernel-setup.yml"
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue