From be32dcebb44e5406656cfe646990f51a4b33f7cf Mon Sep 17 00:00:00 2001
From: Francois Andrieu <darknao@fedoraproject.org>
Date: Tue, 21 Mar 2023 10:09:04 +0100
Subject: [PATCH] websites: new main website deployment on prod

---
 playbooks/include/proxies-redirects.yml       | 42 -------------------
 playbooks/openshift-apps/websites.yml         |  3 --
 ...fedora-web-stg => cron-sync-fedora-web-v3} |  0
 roles/fedora-web/main/tasks/main.yml          | 15 +------
 .../websites/templates/buildconfig.yml        | 30 ++-----------
 5 files changed, 5 insertions(+), 85 deletions(-)
 rename roles/fedora-web/main/files/{cron-sync-fedora-web-stg => cron-sync-fedora-web-v3} (100%)

diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index b063cbe6e8..d872e5210b 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -277,28 +277,6 @@
     path: /index.html
     target: https://flocktofedora.org/
 
-  # Redirect specific websites from fedoraproject.org to getfedora.org
-  - role: httpd/redirect
-    shortname: main-fedoraproject
-    website: fedoraproject.org
-    path: /index.html
-    target: https://getfedora.org/
-    when: env != "staging"
-
-  - role: httpd/redirect
-    shortname: get-fedora-old
-    website: fedoraproject.org
-    path: /get-fedora
-    target: https://getfedora.org/
-    when: env != "staging"
-
-  - role: httpd/redirect
-    shortname: sponsors
-    website: fedoraproject.org
-    path: /sponsors
-    target: https://getfedora.org/sponsors
-    when: env != "staging"
-
   - role: httpd/redirect
     shortname: code-of-conduct
     website: fedoraproject.org
@@ -317,26 +295,6 @@
     path: /code-of-conduct.html
     target: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
 
-  - role: httpd/redirect
-    shortname: verify
-    website: fedoraproject.org
-    path: /verify
-    target: https://getfedora.org/verify
-    when: env != "staging"
-
-  - role: httpd/redirect
-    shortname: keys
-    website: fedoraproject.org
-    path: /keys
-    target: https://getfedora.org/keys
-    when: env != "staging"
-
-  - role: httpd/redirect
-    shortname: release-banner
-    website: fedoraproject.org
-    path: /static/js/release-counter-ext.js
-    target: https://getfedora.org/static/js/release-counter-ext.js
-    when: env != "staging"
 
 #
 # When there is no prerelease we redirect the prerelease urls
diff --git a/playbooks/openshift-apps/websites.yml b/playbooks/openshift-apps/websites.yml
index b191cc53f0..52f1220cf6 100644
--- a/playbooks/openshift-apps/websites.yml
+++ b/playbooks/openshift-apps/websites.yml
@@ -89,15 +89,12 @@
     objectname: fedora-websites-cron.yml
 
   # New websites 3.0
-  # STAGING ONLY
   - role: openshift/object
     app: websites
     file: obc.yml
     objectname: obc.yml
-    when: env == "staging"
 
   - role: openshift/object
     app: websites
     template: deployment.yml
     objectname: deployment.yml
-    when: env == "staging"
diff --git a/roles/fedora-web/main/files/cron-sync-fedora-web-stg b/roles/fedora-web/main/files/cron-sync-fedora-web-v3
similarity index 100%
rename from roles/fedora-web/main/files/cron-sync-fedora-web-stg
rename to roles/fedora-web/main/files/cron-sync-fedora-web-v3
diff --git a/roles/fedora-web/main/tasks/main.yml b/roles/fedora-web/main/tasks/main.yml
index a8abf1e586..a76a39d29f 100644
--- a/roles/fedora-web/main/tasks/main.yml
+++ b/roles/fedora-web/main/tasks/main.yml
@@ -3,36 +3,26 @@
     state: present
     name:
     - s3cmd
-  when: env == "staging"
   tags:
   - fedora-web
   - fedora-web/main
 
-- name: Copy in the sync-fedora-web cronjob
-  copy: src=cron-sync-fedora-web dest=/etc/cron.d/sync-fedora-web
-  tags:
-  - fedora-web
-  - fedora-web/main
-  when: env != "staging"
-
 - name: Load s3 credentials
   ansible.builtin.include_vars:
     file: "{{ private }}/files/websites/s3_fedoraproject_{{ env_short }}.yml"
   ignore_errors: true
-  when: env == "staging"
   tags:
   - fedora-web
   - fedora-web/main
 
-- name: Copy in the sync-fedora-web-stg cronjob
+- name: Copy in the sync-fedora-web-v3 cronjob
   copy:
-    src: cron-sync-fedora-web-stg
+    src: cron-sync-fedora-web-v3
     dest: /etc/cron.d/sync-fedora-web
   tags:
   - fedora-web
   - fedora-web/main
   when:
-  - env == "staging"
   - fedoraproject_s3_bucket_name is defined
 
 - name: Create fedoraproject-sync script
@@ -44,7 +34,6 @@
   - fedora-web
   - fedora-web/main
   when:
-  - env == "staging"
   - fedoraproject_s3_bucket_name is defined
 
 - name: Make directory for the config files for {{website}} we are about to copy
diff --git a/roles/openshift-apps/websites/templates/buildconfig.yml b/roles/openshift-apps/websites/templates/buildconfig.yml
index 8108d644a6..9cb996af6e 100644
--- a/roles/openshift-apps/websites/templates/buildconfig.yml
+++ b/roles/openshift-apps/websites/templates/buildconfig.yml
@@ -8,36 +8,12 @@ spec:
   failedBuildsHistoryLimit: 2
   successfulBuildsHistoryLimit: 1
   source:
-{% if env == 'staging' %}
     git:
       uri: "https://gitlab.com/fedora/websites-apps/fedora-websites/fedora-websites-3.0.git"
-      ref: main
+{% if env == 'staging' %}
+      ref: staging
 {% else %}
-    dockerfile: |-
-      FROM fedora:34
-      RUN dnf -y install \
-        git \
-        nss_wrapper \
-        python-unversioned-command \
-        python3-flask \
-        python3-frozen-flask \
-        python3-flask-assets \
-        python3-rjsmin \
-        python3-cssmin \
-        python3-flask-babel \
-        python3-flask-htmlmin \
-        python3-cssutils \
-        python3-gnupg \
-        rubygem-sass \
-        babel \
-        python3-jinja2 \
-        python3-pyyaml \
-        python3-dateutil \
-        python3-dogpile-cache \
-        python3-requests \
-        python3-zanata-client && \
-          dnf clean all
-      CMD bash /etc/websites/build.sh
+      ref: main
 {% endif %}
   strategy:
     type: Docker