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

iad2-move: drop all the cgit urls from our openshift apps

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2020-06-08 15:40:39 -07:00
parent c7a0d2f3c4
commit 20fd3619e6
5 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/openshift-apps/bodhi/templates/buildconfig.yml
View file

@ -15,7 +15,7 @@ items:
name="bodhi-base" \ name="bodhi-base" \
vendor="Fedora Infrastructure" \ vendor="Fedora Infrastructure" \
license="MIT" license="MIT"
RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags.repo
# While dnf has a --nodocs, it doesen't have a --docs... # While dnf has a --nodocs, it doesen't have a --docs...
RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf
RUN dnf install -y bodhi-server-{{bodhi_version}} bodhi-docs-{{bodhi_version}} python3-pyramid_sawing python3-gunicorn RUN dnf install -y bodhi-server-{{bodhi_version}} bodhi-docs-{{bodhi_version}} python3-pyramid_sawing python3-gunicorn

10
roles/openshift-apps/fas/templates/buildconfig-fas.yml
View file

@ -9,12 +9,12 @@ spec:
source: source:
dockerfile: |- dockerfile: |-
FROM registry.access.redhat.com/rhel6 FROM registry.access.redhat.com/rhel6
RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel6.repo && \ RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel6.repo && \
curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/epel6.repo && \ curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/epel6.repo && \
{% if env == "staging" %} {% if env == "staging" %}
curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags-stg.repo && \ curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags-stg.repo && \
{% endif %} {% endif %}
curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags.repo curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags.repo
RUN yum install -y \ RUN yum install -y \
fas \ fas \
@ -45,7 +45,7 @@ spec:
ln -sf /usr/sbin/fas.wsgi /app/app.py ln -sf /usr/sbin/fas.wsgi /app/app.py
RUN yum install -y patch && \ RUN yum install -y patch && \
curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/fas_server/files/0001-bugfix.patch | patch /usr/lib/python2.6/site-packages/CherryPy-2.3.0-py2.6.egg/cherrypy/_cphttptools.py && \ curl https://infrastructure.fedoraproject.org/infra/ansible/roles/fas_server/files/0001-bugfix.patch | patch /usr/lib/python2.6/site-packages/CherryPy-2.3.0-py2.6.egg/cherrypy/_cphttptools.py && \
rm -f /usr/lib/python2.6/site-packages/CherryPy-2.3.0-py2.6.egg/cherrypy/_cphttptools.py{c,o} rm -f /usr/lib/python2.6/site-packages/CherryPy-2.3.0-py2.6.egg/cherrypy/_cphttptools.py{c,o}

12
roles/openshift-apps/fas/templates/buildconfig-totpcgi.yml
View file

@ -9,12 +9,12 @@ spec:
source: source:
dockerfile: |- dockerfile: |-
FROM registry.access.redhat.com/rhel6 FROM registry.access.redhat.com/rhel6
RUN curl -v -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel6.repo && \ RUN curl -v -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel6.repo && \
curl -v -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/epel6.repo && \ curl -v -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/epel6.repo && \
{% if env == "staging" %} {% if env == "staging" %}
curl -v -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags-stg.repo && \ curl -v -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags-stg.repo && \
{% endif %} {% endif %}
curl -v -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags.repo curl -v -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags.repo
RUN yum install -y \ RUN yum install -y \
mod_auth_pgsql \ mod_auth_pgsql \
@ -26,8 +26,8 @@ spec:
python-fedora \ python-fedora \
python-psycopg2 python-psycopg2
RUN curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/totpcgi/files/index.cgi -o /var/www/totpcgi/index.cgi RUN curl https://infrastructure.fedoraproject.org/infra/ansible/roles/totpcgi/files/index.cgi -o /var/www/totpcgi/index.cgi
RUN curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/totpcgi/files/provisioning.cgi -o /var/www/totpcgi-provisioning/index.cgi RUN curl https://infrastructure.fedoraproject.org/infra/ansible/roles/totpcgi/files/provisioning.cgi -o /var/www/totpcgi-provisioning/index.cgi
RUN chmod -R o+rx /var/www/totpcgi* RUN chmod -R o+rx /var/www/totpcgi*

8
roles/openshift-apps/fas/templates/buildconfig-yubikey.yml
View file

@ -9,12 +9,12 @@ spec:
source: source:
dockerfile: |- dockerfile: |-
FROM registry.access.redhat.com/rhel6 FROM registry.access.redhat.com/rhel6
RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel6.repo && \ RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel6.repo && \
curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/epel6.repo && \ curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/epel6.repo && \
{% if env == "staging" %} {% if env == "staging" %}
curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags-stg.repo && \ curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags-stg.repo && \
{% endif %} {% endif %}
curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags.repo curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags.repo
RUN yum install -y \ RUN yum install -y \
httpd \ httpd \

12
roles/openshift-apps/ipsilon/templates/buildconfig.yml
View file

@ -9,9 +9,9 @@ spec:
source: source:
dockerfile: |- dockerfile: |-
FROM fedora:31 FROM fedora:31
RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags.repo
{% if env == "staging" %} {% if env == "staging" %}
RUN curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags-stg.repo RUN curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags-stg.repo
RUN curl -o /etc/yum.repos.d/fedora-updates-testing.repo https://src.fedoraproject.org/rpms/fedora-repos/raw/master/f/fedora-updates-testing.repo RUN curl -o /etc/yum.repos.d/fedora-updates-testing.repo https://src.fedoraproject.org/rpms/fedora-repos/raw/master/f/fedora-updates-testing.repo
{% endif %} {% endif %}
RUN dnf install -y \ RUN dnf install -y \
@ -35,12 +35,12 @@ spec:
python3-mod_wsgi python3-mod_wsgi
# Fedora specific stuff - Terrible hacky way to install, but works for testing purposes # Fedora specific stuff - Terrible hacky way to install, but works for testing purposes
RUN curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/ipsilon/files/api.py -o /usr/lib/python3.7/site-packages/ipsilon/providers/openid/extensions/api.py && \ RUN curl https://infrastructure.fedoraproject.org/infra/ansible/roles/ipsilon/files/api.py -o /usr/lib/python3.7/site-packages/ipsilon/providers/openid/extensions/api.py && \
{% for scope_file in oidc_scope_filenames %} {% for scope_file in oidc_scope_filenames %}
curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/ipsilon/files/oidc_scopes/{{ scope_file }}.py -o /usr/lib/python3.7/site-packages/ipsilon/providers/openidc/plugins/{{scope_file}}.py && \ curl https://infrastructure.fedoraproject.org/infra/ansible/roles/ipsilon/files/oidc_scopes/{{ scope_file }}.py -o /usr/lib/python3.7/site-packages/ipsilon/providers/openidc/plugins/{{scope_file}}.py && \
{% endfor %} {% endfor %}
curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/ipsilon/files/infofas.py -o /usr/lib/python3.7/site-packages/ipsilon/info/infofas.py && \ curl https://infrastructure.fedoraproject.org/infra/ansible/roles/ipsilon/files/infofas.py -o /usr/lib/python3.7/site-packages/ipsilon/info/infofas.py && \
curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/ipsilon/files/py3-openid_server.py?1 -o /usr/lib/python3.7/site-packages/openid/server/server.py curl https://infrastructure.fedoraproject.org/infra/ansible/roles/ipsilon/files/py3-openid_server.py?1 -o /usr/lib/python3.7/site-packages/openid/server/server.py
# Set up krb5 # Set up krb5
RUN rm -f /etc/krb5.conf && ln -sf /etc/ipsilon/krb5.conf /etc/krb5.conf RUN rm -f /etc/krb5.conf && ln -sf /etc/ipsilon/krb5.conf /etc/krb5.conf