Adding local changes, round 1 (#16)

Glimesh · Apr 17, 2021 · 1bf239b · 1bf239b
1 parent af16905
commit 1bf239b
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 6 deletions.
diff --git a/ansible/.gitignore b/ansible/.gitignore
@@ -1,2 +1,4 @@
 hosts
-hosts.ini
+hosts.ini
+glimesh-deploy
+glimesh-deploy.pub
diff --git a/ansible/roles/glimesh-web/defaults/main.yml b/ansible/roles/glimesh-web/defaults/main.yml
@@ -39,4 +39,6 @@ glimesh_waffle_asset_host: some_value
 glimesh_twitter_consumer_key: some_value
 glimesh_twitter_consumer_secret: some_value
 glimesh_twitter_access_token: some_value
-glimesh_twitter_access_secret: some_value
+glimesh_twitter_access_secret: some_value
+
+glimesh_start_workers: false
diff --git a/ansible/roles/glimesh-web/templates/glimesh.service.j2 b/ansible/roles/glimesh-web/templates/glimesh.service.j2
@@ -19,6 +19,9 @@ Environment="RELEASE_NODE={{ glimesh_release_node }}"
 Environment="RELEASE_DISTRIBUTION={{ glimesh_release_distribution }}"
 
 Environment="ENABLE_LIBCLUSTER=true"
+{% if glimesh_start_workers %}
+Environment="GLIMESH_START_WORKERS=true"
+{% endif %}
 
 Environment="DATABASE_URL={{ glimesh_database_url }}"
 Environment="SECRET_KEY_BASE={{ glimesh_secret_key_base }}"
@@ -59,5 +62,7 @@ Environment="APPSIGNAL_API_KEY={{ appsignal_api_key }}"
 Environment="TAXIDPRO_API_KEY={{ glimesh_taxidpro_api_key }}"
 Environment="TAXIDPRO_WEBHOOK_SECRET={{ glimesh_taxidpro_webhook_secret }}"
 
+Environment="RAWG_API_KEY={{ glimesh_rawg_api_key }}"
+
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/ansible/roles/janus-ftl-plugin/tasks/main.yml b/ansible/roles/janus-ftl-plugin/tasks/main.yml
@@ -38,6 +38,42 @@
   pip:
     name: meson
 
+# System Configuration
+- name: set net.core.rmem_default
+  sysctl:
+    name: net.core.rmem_default
+    value: '1048576'
+  tags: 
+    - system_config
+
+- name: set net.core.wmem_default
+  sysctl:
+    name: net.core.wmem_default
+    value: '1048576'
+  tags: 
+    - system_config
+
+- name: set net.core.rmem_max
+  sysctl:
+    name: net.core.rmem_max
+    value: '1048576'
+  tags: 
+    - system_config
+
+- name: set net.core.wmem_max
+  sysctl:
+    name: net.core.wmem_max
+    value: '1048576'
+  tags: 
+    - system_config
+
+- name: set kernel.core_pattern
+  sysctl:
+    name: kernel.core_pattern
+    value: 'core.%e.%p.%t'
+  tags: 
+    - system_config
+
 # libnice
 - name: ensure /tmp/libnice exists
   file: path=/tmp/libnice state=directory

diff --git a/ansible/roles/janus-ftl-plugin/templates/janus.service.j2 b/ansible/roles/janus-ftl-plugin/templates/janus.service.j2
@@ -34,7 +34,7 @@ Environment="FTL_SERVICE_GLIMESH_PORT=443"
 Environment="FTL_SERVICE_GLIMESH_HTTPS=1"
 Environment="FTL_SERVICE_GLIMESH_CLIENTID={{ glimesh_client_id }}"
 Environment="FTL_SERVICE_GLIMESH_CLIENTSECRET={{ glimesh_client_secret }}"
-Environment="FTL_MAX_ALLOWED_BITS_PER_SECOND=6500000"
+Environment="FTL_MAX_ALLOWED_BITS_PER_SECOND=7500000"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ansible/roles/monitor/templates/prometheus.service.j2 b/ansible/roles/monitor/templates/prometheus.service.j2
@@ -8,7 +8,7 @@ User={{ prometheus_user_name }}
 Group={{ prometheus_group_name }}
 Restart=on-abnormal
 Type=simple
-ExecStart=/usr/local/bin/prometheus --config.file=/etc/prometheus/prometheus.conf --storage.tsdb.path=/data/prometheus --storage.tsdb.retention=2d
+ExecStart=/usr/local/bin/prometheus --config.file=/etc/prometheus/prometheus.conf --storage.tsdb.path=/data/prometheus --storage.tsdb.retention=31d
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target