Add osmch containers

OpenHistoricalMap · Sep 12, 2023 · 219618c · 219618c
1 parent 70ef187
commit 219618c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/chartpress.yaml b/.github/workflows/chartpress.yaml
@@ -78,6 +78,9 @@ jobs:
         STAGING_OSMCHA_PG_USER: ${{ secrets.STAGING_OSMCHA_PG_USER }}
         STAGING_OSMCHA_PG_PASSWORD: ${{ secrets.STAGING_OSMCHA_PG_PASSWORD }}
         STAGING_OSMCHA_PG_DATABASE: ${{ secrets.STAGING_OSMCHA_PG_DATABASE }}
+        STAGING_OSMCHA_CONSUMER_KEY: ${{ secrets.STAGING_OSMCHA_CONSUMER_KEY }}
+        STAGING_OSMCHA_CONSUMER_SECRET: ${{ secrets.STAGING_OSMCHA_CONSUMER_SECRET }}
+        STAGING_OSMCHA_DJANGO_SECRET_KEY: ${{ secrets.STAGING_OSMCHA_DJANGO_SECRET_KEY }}
     - name: Production - substitute secrets
       if: github.ref == 'refs/heads/main'
       uses: bluwy/substitute-string-action@v1
@@ -129,7 +132,9 @@ jobs:
         PRODUCTION_OSMCHA_PG_USER: ${{ secrets.PRODUCTION_OSMCHA_PG_USER }}
         PRODUCTION_OSMCHA_PG_PASSWORD: ${{ secrets.PRODUCTION_OSMCHA_PG_PASSWORD }}
         PRODUCTION_OSMCHA_PG_DATABASE: ${{ secrets.PRODUCTION_OSMCHA_PG_DATABASE }}
-
+        PRODUCTION_OSMCHA_CONSUMER_KEY: ${{ secrets.PRODUCTION_OSMCHA_CONSUMER_KEY }}
+        PRODUCTION_OSMCHA_CONSUMER_SECRET: ${{ secrets.PRODUCTION_OSMCHA_CONSUMER_SECRET }}
+        PRODUCTION_OSMCHA_DJANGO_SECRET_KEY: ${{ secrets.PRODUCTION_OSMCHA_DJANGO_SECRET_KEY }}
     - name: AWS Credentials
       if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main'
       uses: aws-actions/configure-aws-credentials@v1
@@ -140,17 +145,7 @@ jobs:
 
     - name: Setup Kubectl and Helm Dependencies
       if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main'
-      run: |
-       sudo pip install awscli --ignore-installed six
-       sudo curl -L -o /usr/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/kubectl
-       sudo chmod +x /usr/bin/kubectl
-       sudo curl -o /usr/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/aws-iam-authenticator
-       sudo chmod +x /usr/bin/aws-iam-authenticator
-       wget https://get.helm.sh/helm-v3.5.0-linux-amd64.tar.gz -O helm.tar.gz
-       tar -xvzf helm.tar.gz
-       sudo mv linux-amd64/helm /usr/local/bin/ 
-       sudo chmod +x /usr/local/bin/helm
-
+      run: "sudo pip install awscli --ignore-installed six\nsudo curl -L -o /usr/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/kubectl\nsudo chmod +x /usr/bin/kubectl\nsudo curl -o /usr/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/aws-iam-authenticator\nsudo chmod +x /usr/bin/aws-iam-authenticator\nwget https://get.helm.sh/helm-v3.5.0-linux-amd64.tar.gz -O helm.tar.gz\ntar -xvzf helm.tar.gz\nsudo mv linux-amd64/helm /usr/local/bin/ \nsudo chmod +x /usr/local/bin/helm\n #magic___^_^___line\n"
     - name: Update kube-config staging
       if: github.ref == 'refs/heads/staging'
       run: aws eks --region us-east-1 update-kubeconfig --name osmseed-staging

diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
 - name: osm-seed
-  version: '0.1.0-n772.hb720b2f'
+  version: '0.1.0-n775.hce23b13'
   repository: https://devseed.com/osm-seed-chart/
diff --git a/values.staging.template.yaml b/values.staging.template.yaml
@@ -704,9 +704,10 @@ osm-seed:
     osmchaWeb:
       enabled: false
       env:
+        OSM_SERVER_URL: 'https://staging.openhistoricalmap.org'
         DJANGO_CACHES: "{'default': {'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', 'LOCATION': '127.0.0.1:11211'}}"
         DJANGO_DEBUG: "False"
-        DJANGO_SECRET_KEY: "123456789"
+        DJANGO_SECRET_KEY: {{STAGING_OSMCHA_DJANGO_SECRET_KEY}}
         DJANGO_SECURE_BROWSER_XSS_FILTER: "True"
         DJANGO_SECURE_SSL_REDIRECT: "True"
         DJANGO_SECURE_CONTENT_TYPE_NOSNIFF: "True"
@@ -718,12 +719,12 @@ osm-seed:
         DJANGO_SERVER_EMAIL: "[email protected]"
         DJANGO_EMAIL_SUBJECT_PREFIX: "osmcha"
         DJANGO_CHANGESETS_FILTER: "{'some_filter_key': 'some_filter_value'}"
-        # OAUTH_OSM_KEY: "your_osm_oauth_key"
-        # OAUTH_OSM_SECRET: "your_osm_oauth_secret"
+        OAUTH_OSM_KEY: {{STAGING_OSMCHA_CONSUMER_KEY}}
+        OAUTH_OSM_SECRET: {{STAGING_OSMCHA_CONSUMER_SECRET}}
         DJANGO_ANON_USER_THROTTLE_RATE: "10/h"
         DJANGO_COMMON_USER_THROTTLE_RATE: "100/h"
         DJANGO_NON_STAFF_USER_THROTTLE_RATE: "50/h"
-        OAUTH_REDIRECT_URI: "https://staging.openhistoricalmap.org/oauth/callback"
+        OAUTH_REDIRECT_URI: https://osmcha.openhistoricalmap.org/oauth-landing.html
         OSMCHA_FRONTEND_VERSION: "v1.0.0"
         DJANGO_ENABLE_CHANGESET_COMMENTS: "True"
         DJANGO_OSM_COMMENTS_API_KEY: "test"