Merge pull request #225 from OpenHistoricalMap/staging

Updates for production

images/tiler-server/cache_cleaner.sh

@@ -3,5 +3,5 @@ flag=true
 while "$flag" = true; do
   pg_isready -h $POSTGRES_HOST -p 5432 >/dev/null 2>&2 || continue
   flag=false
-  ./tile_cache_downloader.sh & ./expire-watcher.sh & ./rm_tegola_ps.sh
+  ./tile_cache_downloader.sh & ./expire-watcher.sh
 done

images/web/config/cgimap.conf

@@ -11,7 +11,7 @@
     # This section could be placed in a .htaccess file in /var/www/public, but
     # the ProxyPreserveHost directive can't. If you don't have access to the
     # apache config you won't be able to get OAuth to work
-
+    
     # Enable rewrites
     RewriteEngine on
 

images/web/config/production.conf

@@ -3,7 +3,6 @@
     # Tell Apache and Passenger where your app's 'public' directory is
     DocumentRoot /var/www/public
     PassengerRuby /usr/bin/ruby
-
     RewriteEngine On
     RewriteCond %{HTTP:X-Forwarded-Proto} =http
     #  Development mode in case domain is localhost

ohm/requirements.yaml

@@ -1,4 +1,4 @@
 dependencies:
 - name: osm-seed
-  version: '0.1.0-n768.h455eb76'
+  version: '0.1.0-n766.h9014f61'
   repository: https://devseed.com/osm-seed-chart/

values.production.template.yaml

@@ -113,7 +113,7 @@ osm-seed:
         memory: "2Gi"
         cpu: "1"
       limits:
-        memory: "2Gi"
+        memory: "4Gi"
         cpu: "2"
     autoscaling:
       enabled: true
@@ -408,19 +408,19 @@ osm-seed:
     replicaCount: 1
     command: './cache_cleaner.sh'
     resources:
-      enabled: false
+      enabled: true
       requests:
-        memory: "8Gi"
-        cpu: "1"
-      limits:
-        memory: "10Gi"
+        memory: "1Gi"
         cpu: "2"
+      limits:
+        memory: "2Gi"
+        cpu: "4"
     env:
-      KILL_PROCESS: manually
+      KILL_PROCESS: none
       MAX_NUM_PS: 5
       PROCESS_NAME: tegola
     autoscaling:
-      enabled: true
+      enabled: false
       minReplicas: 1
       maxReplicas: 1
       cpuUtilization: 90
@@ -653,4 +653,18 @@ osm-seed:
       enabled: true
       label_key: nodegroup_type
       label_value: web
-
+  # ====================================================================================================
+  # Variables for changeset-replication-job, Configuration to create the replication files by, minute, hour, or day
+  # ====================================================================================================
+  changesetReplicationJob:
+    enabled: true
+    resources:
+      enabled: false
+      requests:
+        memory: '20Gi'
+        cpu: '8'
+      limits:
+        memory: '24Gi'
+        cpu: '10'
+    nodeSelector:
+      enabled: false

values.staging.template.yaml

@@ -443,11 +443,11 @@ osm-seed:
           memory: "10Gi"
           cpu: "2"
       env:
-        KILL_PROCESS: manually
+        KILL_PROCESS: none
         MAX_NUM_PS: 4
         PROCESS_NAME: tegola
       autoscaling:
-        enabled: true
+        enabled: false
         minReplicas: 1
         maxReplicas: 1
         cpuUtilization: 90
@@ -684,4 +684,19 @@ osm-seed:
       nodeSelector:
         enabled: true
         label_key: nodegroup_type
-        label_value: web
+        label_value: web
+# ====================================================================================================
+# Variables for changeset-replication-job, Configuration to create the replication files by, minute, hour, or day
+# ====================================================================================================
+    changesetReplicationJob:
+      enabled: true
+      resources:
+        enabled: false
+        requests:
+          memory: '20Gi'
+          cpu: '8'
+        limits:
+          memory: '24Gi'
+          cpu: '10'
+      nodeSelector:
+        enabled: false