From 8fe6c7b8a7914b185a57681df844bf32f4863cc9 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 14 Jul 2014 04:33:04 +0000 Subject: [PATCH 01/11] Cleanup the database whenever the FedOAuth playbook is ran --- roles/fedoauth/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/fedoauth/tasks/main.yml b/roles/fedoauth/tasks/main.yml index c37a3ffea4..874400e4e0 100644 --- a/roles/fedoauth/tasks/main.yml +++ b/roles/fedoauth/tasks/main.yml @@ -52,6 +52,11 @@ environment: FEDOAUTH_CONFIG: /etc/fedoauth/fedoauth.cfg +- name: Clean the database + command: /usr/bin/python2 /usr/share/fedoauth/cleanup.py + environment: + FEDOAUTH_CONFIG: /etc/fedoauth/fedoauth.cfg + - name: set sebooleans so fedoauth can talk to the db action: seboolean name=httpd_can_network_connect_db state=true From 575ea5135a9cbd69d5d5e8639343fcb4af090cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 14 Jul 2014 11:06:38 +0000 Subject: [PATCH 02/11] add fedora-21 to copr temporary - untill it arrive to mock --- .../provision/files/mock/fedora-21-i386.cfg | 63 +++++++++++++++++++ .../provision/files/mock/fedora-21-x86_64.cfg | 63 +++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 files/copr/provision/files/mock/fedora-21-i386.cfg create mode 100644 files/copr/provision/files/mock/fedora-21-x86_64.cfg diff --git a/files/copr/provision/files/mock/fedora-21-i386.cfg b/files/copr/provision/files/mock/fedora-21-i386.cfg new file mode 100644 index 0000000000..9ac64f2933 --- /dev/null +++ b/files/copr/provision/files/mock/fedora-21-i386.cfg @@ -0,0 +1,63 @@ +config_opts['root'] = 'fedora-21-i386' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '21' + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +failovermethod=priority + +[updates] +name=updates +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +failovermethod=priority + +[updates-testing] +name=updates-testing +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/i386/ +cost=2000 +enabled=0 + +[fedora-debuginfo] +name=fedora-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[updates-debuginfo] +name=updates-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[updates-testing-debuginfo] +name=updates-testing-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +""" diff --git a/files/copr/provision/files/mock/fedora-21-x86_64.cfg b/files/copr/provision/files/mock/fedora-21-x86_64.cfg new file mode 100644 index 0000000000..517be438a0 --- /dev/null +++ b/files/copr/provision/files/mock/fedora-21-x86_64.cfg @@ -0,0 +1,63 @@ +config_opts['root'] = 'fedora-21-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'fc21' # only useful for --resultdir variable subst +config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['releasever'] = '21' + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[fedora] +name=fedora +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch +failovermethod=priority + +[updates] +name=updates +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch +failovermethod=priority + +[updates-testing] +name=updates-testing +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/x86_64/ +cost=2000 +enabled=0 + +[fedora-debuginfo] +name=fedora-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[updates-debuginfo] +name=updates-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 + +[updates-testing-debuginfo] +name=updates-testing-debuginfo +metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch +failovermethod=priority +enabled=0 +""" From 38b2a5fc7532628358fa517141123441a887cba4 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 14 Jul 2014 12:59:02 +0000 Subject: [PATCH 03/11] fixing taskotron-dev proxy settings for resultsdb and resultsdb_frontend --- inventory/group_vars/taskotron-dev | 4 ++-- roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 3c27898079..2245d88673 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -22,8 +22,8 @@ master_dir: /home/buildmaster/master master_user: buildmaster external_hostname: taskotron.dev.fedoraproject.org resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0 -resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/ -resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/ +resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb +resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb_api/ resultsdb_endpoint: resultsdb resultsdb_api_endpoint: resultsdb_api landingpage_title: "Taskotron Development" diff --git a/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 index b24f2246da..dc3568d764 100644 --- a/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 +++ b/roles/taskotron/taskotron-proxy/templates/resultsdb.conf.j2 @@ -5,7 +5,7 @@ - ProxyPass {{ resultsdb_url }} - ProxyPassReverse {{ resultsdb_url }} + ProxyPass {{ resultsdb_external_url }} + ProxyPassReverse {{ resultsdb_external_url }} RequestHeader add X-Script-Name /{{ resultsdb_api_endpoint }}/ From 4a37544c3fe6b5d6c36f7ef97c1c6b68ddd6df6c Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 14 Jul 2014 13:17:34 +0000 Subject: [PATCH 04/11] adding dev/stg/prod configs for buildmaster user --- .../templates/taskotron.master.cfg.j2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 400bef99b7..50d80220de 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -194,7 +194,12 @@ authz_cfg=authz.Authz( {% if deployment_type == 'dev' %} auth=auth.BasicAuth([("{{ dev_buildbot_user }}","{{ dev_buildbot_password }}")]), {% endif %} - #auth=auth.BasicAuth([("{{ buildbot_user }}","{{ buildbot_pw }}")]), + {% if deployment_type == 'stg' %} + auth=auth.BasicAuth([("{{ stg_buildbot_user }}","{{ stg_buildbot_password }}")]), + {% endif %} + {% if deployment_type == 'prod' %} + auth=auth.BasicAuth([("{{ prod_buildbot_user }}","{{ prod_buildbot_password }}")]), + {% endif %} gracefulShutdown = False, forceBuild = 'auth', # use this to test your slave once it is set up forceAllBuilds = False, From 9a67e35a9e20e5a7e3af5a92f92c4573549b7ea6 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 14 Jul 2014 13:19:21 +0000 Subject: [PATCH 05/11] Take sysadmin-main out of pkgdb admin list in staging for testing. --- roles/pkgdb2/templates/pkgdb2.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg index 586fba3450..f33dc777df 100644 --- a/roles/pkgdb2/templates/pkgdb2.cfg +++ b/roles/pkgdb2/templates/pkgdb2.cfg @@ -17,7 +17,11 @@ ITEMS_PER_PAGE = 50 AUTO_APPROVE = ['watchcommits', 'watchbugzilla'] #### FAS group for the pkgdb admins +{% if env == 'staging' %} +ADMIN_GROUP = ['cvsadmin'] +{% else %} ADMIN_GROUP = ['sysadmin-main', 'cvsadmin'] +{% endif %} ### The default backend for dogpile ### Options are listed at: From 95901b885b4aab8e343b012b784b145d5b69491f Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 14 Jul 2014 13:26:22 +0000 Subject: [PATCH 06/11] fixing resultsdb_frontend_url to work with dev proxy config --- inventory/group_vars/taskotron-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 2245d88673..e659394b7e 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -22,7 +22,7 @@ master_dir: /home/buildmaster/master master_user: buildmaster external_hostname: taskotron.dev.fedoraproject.org resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0 -resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb +resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/ resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb_api/ resultsdb_endpoint: resultsdb resultsdb_api_endpoint: resultsdb_api From 79fdf11a1ca306f2fe26062ec813ed4b71177df8 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 14 Jul 2014 13:28:58 +0000 Subject: [PATCH 07/11] updating taskotron landingpage to work with new resultsdb endpoints --- .../taskotron-frontend/templates/landingpage.html.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 b/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 index 133e09bcff..4f6ad2cd8b 100644 --- a/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 +++ b/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 @@ -84,9 +84,9 @@ From 504b24ebcea09e20853ceeb7fe32d872b77eeba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 14 Jul 2014 13:34:24 +0000 Subject: [PATCH 08/11] install postfix on copr-fe so we get emails about tracebacks --- playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml | 1 + playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml index 58ce2f4442..970e56b914 100644 --- a/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml @@ -23,6 +23,7 @@ tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks }}/postfix_basic.yml" - include: "{{ tasks }}/iptables.yml" - name: copy copr.repo diff --git a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml index f6f64ed365..04273cce16 100644 --- a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml @@ -23,6 +23,8 @@ tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" + - include: "{{ tasks }}/postfix_basic.yml" + - name: mount up disk of copr fe action: mount name=/srv/copr-fe src='LABEL=copr-fe' fstype=ext4 state=mounted - include: "{{ tasks }}/iptables.yml" From 892dec6138ba0eb4b0aa77753c6cb7e298368318 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 14 Jul 2014 13:40:14 +0000 Subject: [PATCH 09/11] relative links don't need a hostname --- .../taskotron-frontend/templates/landingpage.html.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 b/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 index 4f6ad2cd8b..1dea6ca961 100644 --- a/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 +++ b/roles/taskotron/taskotron-frontend/templates/landingpage.html.j2 @@ -84,9 +84,9 @@ From ce0f825ce770bcf149bd9ead09ad5d3534238c2d Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 14 Jul 2014 13:40:29 +0000 Subject: [PATCH 10/11] fixing external hostname for taskotron-dev --- inventory/group_vars/taskotron-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index e659394b7e..19943681ed 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -20,7 +20,7 @@ buildmaster_dir: /home/buildmaster/master buildslave_dir: /home/buildslave/slave master_dir: /home/buildmaster/master master_user: buildmaster -external_hostname: taskotron.dev.fedoraproject.org +external_hostname: taskotron-dev.fedoraproject.org resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0 resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/ resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb_api/ From 9168bb8f3ed26ab256c64244d196394b6a0ab62a Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 14 Jul 2014 18:16:42 +0000 Subject: [PATCH 11/11] Make a home for badge stls. --- roles/badges/frontend/files/tahrir.conf | 1 + roles/badges/frontend/tasks/main.yml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/roles/badges/frontend/files/tahrir.conf b/roles/badges/frontend/files/tahrir.conf index b65d7041d0..b7be161d4f 100644 --- a/roles/badges/frontend/files/tahrir.conf +++ b/roles/badges/frontend/files/tahrir.conf @@ -1,5 +1,6 @@ Alias /static /usr/lib/python2.6/site-packages/tahrir/static Alias /pngs /usr/share/badges/pngs +Alias /stls /usr/share/badges/stls WSGIDaemonProcess tahrir user=tahrir group=tahrir maximum-requests=1000 display-name=tahrir processes=4 threads=4 WSGISocketPrefix run/wsgi diff --git a/roles/badges/frontend/tasks/main.yml b/roles/badges/frontend/tasks/main.yml index f1e312eb6d..7c5ef23294 100644 --- a/roles/badges/frontend/tasks/main.yml +++ b/roles/badges/frontend/tasks/main.yml @@ -94,5 +94,23 @@ tags: - assets +- name: make badge stl directory + file: > + path=/usr/share/badges/stls + state=directory + owner=root group=root mode=0755 + tags: + - assets + +- name: copy over all our badge images + copy: > + src={{ item }} + dest=/usr/share/badges/stls/ + owner=root group=root mode=0644 + with_fileglob: + - /srv/web/infra/badges/stls/*.stl + tags: + - assets + - name: ensure selinux lets httpd talk to postgres seboolean: name=httpd_can_network_connect_db persistent=yes state=yes