added noctua-alliance-pathway-preview and allowed for better tuning of QS_ClientEventBlockCount

Author: abessiari

production/config-stack.yaml.sample

@@ -11,7 +11,8 @@ stack:
      S3_BUCKET: REPLACE_ME_APACHE_LOG__BUCKET
 
      USE_QOS: 1
-     QS_ClientEventBlockCount: "350 300"
+     QS_ClientEventBlockCount: 350 
+     QS_ClientEventBlockCountSeconds: 300
      QS_ClientEventBlockExcludeIP: "9.9.9.9"
 
      minerva_java_opts: "-Xmx8G"
@@ -21,18 +22,20 @@ stack:
 
      BLAZEGRAPH_JOURNAL: REPLACE_ME
 
+     # HTTP OR HTTPS
      noctua_host: REPLACE_ME # aes-test-noctua.geneontology.io
      noctua_lookup_url: REPLACE_ME # http://aes-test-noctua.geneontology.io
 
 
      # HTTP OR HTTPS
-     barista_protocol: https
      github_client_id: 'REPLACE_ME'
      github_client_secret: 'REPLACE_ME'
-
      github_callback_url: REPLACE_ME # https://aes-test-barista.geneontology.io/auth/github/callback
+
+     # HTTP OR HTTPS
      golr_lookup_url: REPLACE_ME # https://aes-test-golr.geneontology.io/solr
 
+     # HTTP OR HTTPS
      barista_lookup_host: REPLACE_ME # aes-test-barista.geneontology.io
      barista_lookup_url: REPLACE_ME # https://aes-test-barista.geneontology.io
    scripts: [ stage.yaml, start_services.yaml]

qos-vars.yaml

@@ -17,7 +17,8 @@ QS_ClientEventPerSecLimit: 10
 QS_ClientEventRequestLimit: 10
 
 # Maximum requests allowed to / per ip address, per x seconds (number of requests, number of seconds)
-QS_ClientEventBlockCount: "350 300"
+QS_ClientEventBlockCount: 350
+QS_ClientEventBlockCountSeconds: 300
 
 # IP addresses excluded from request limits (office IP address) seperated by blank space.
 QS_ClientEventBlockExcludeIP: "9.9.9.9 8.8.8.8"

templates/qos.conf

@@ -22,6 +22,6 @@
   QS_ClientEventPerSecLimit {{ QS_ClientEventRequestLimit }} 
 
   # Maximum requests allowed to / per ip address, per x seconds (number of requests, number of seconds)
-  QS_ClientEventBlockCount {{ QS_ClientEventBlockCount }}
+  QS_ClientEventBlockCount {{ QS_ClientEventBlockCount }} {{ QS_ClientEventBlockCountSeconds }}
 
 </IfModule>

templates/startup.yaml

@@ -81,6 +81,8 @@ WORKBENCHES:
   type: list
   value:
     - '/stage_dir/noctua-form/workbenches'
+    - '/stage_dir/noctua-visual-pathway-editor/workbenches'
+    - '/stage_dir/noctua-alliance-pathway-preview/workbenches'
     - '/stage_dir/noctua-landing-page/workbenches'
     - 'workbenches'
 ## Minerva operations preferences.

vars.yaml

@@ -14,6 +14,7 @@ staged_repos:
    noctua-models: master
    go-site: master
    noctua-visual-pathway-editor: master
+   noctua-alliance-pathway-preview: master
 
 ################
 # minerva JAVA_OPTS