Page MenuHomeDevCentral
Files F3816465

D3618.diff
No OneTemporary
Actions

D3618.diff
View Options

diff --git a/PORTS b/PORTS
--- a/PORTS
+++ b/PORTS
@@ -8,7 +8,6 @@
3000 Mastodon public HTTP
4000 Mastodon streaming HTTP
15674 RabbitMQ
- 41080 Nasqueron Tools HTTP
reserved-for-legacy-docker-migration-low-priority
4440 Rundeck HTTP
@@ -26,6 +25,7 @@
16080 Orbeon HTTP
17080 Penpot - back-end
17300 Penpot - exporter
+ 18080 Nasqueron Tools HTTP
19080 Nasqueron API - Datasources
20080 Nasqueron API - Docker registry API
22220 Phabricator Aphlict (client)
diff --git a/pillar/paas/docker/docker-002/tools.sls b/pillar/paas/docker/docker-002/tools.sls
new file mode 100644
--- /dev/null
+++ b/pillar/paas/docker/docker-002/tools.sls
@@ -0,0 +1,15 @@
+# -------------------------------------------------------------
+# Salt — Provision Docker engine
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+docker_images:
+ - nasqueron/tools
+
+docker_containers:
+ tools:
+ tools:
+ app_port: 18080
+ host: tools.nasqueron.org
diff --git a/roles/paas-docker/containers/tools.sls b/roles/paas-docker/containers/tools.sls
new file mode 100644
--- /dev/null
+++ b/roles/paas-docker/containers/tools.sls
@@ -0,0 +1,24 @@
+# -------------------------------------------------------------
+# Salt — Provision Docker engine
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% for instance, container in pillar['docker_containers']['tools'].items() %}
+
+# -------------------------------------------------------------
+# Container
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ instance }}:
+ docker_container.running:
+ - detach: True
+ - interactive: True
+ - image: nasqueron/tools
+ - ports:
+ - 80
+ - port_bindings:
+ - {{ container['app_port'] }}:80
+
+{% endfor %}
diff --git a/roles/paas-docker/nginx/files/vhosts/tools.conf b/roles/paas-docker/nginx/files/vhosts/tools.conf
new file mode 100644
--- /dev/null
+++ b/roles/paas-docker/nginx/files/vhosts/tools.conf
@@ -0,0 +1,46 @@
+# -------------------------------------------------------------
+# Configuration for Docker PaaS front-end nginx
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Author: Sébastien Santoro aka Dereckson
+# Source file: roles/paas-docker/nginx/files/vhosts/tools.conf
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name {{ fqdn }};
+
+ include includes/letsencrypt;
+
+ return 301 https://$host$request_uri;
+}
+
+server {
+ server_name {{ fqdn }};
+
+ include includes/tls;
+ ssl_certificate /srv/letsencrypt/etc/live/{{ fqdn }}/fullchain.pem;
+ ssl_certificate_key /srv/letsencrypt/etc/live/{{ fqdn }}/privkey.pem;
+
+ include includes/letsencrypt;
+
+ location / {
+ rewrite ^/color/screen/(.+)$ /?Topic=color-screen&Color=$1;
+
+ proxy_pass http://localhost:{{ app_port }};
+
+ include includes/proxy_params;
+ proxy_redirect off;
+ }
+
+ root /var/wwwroot-502/_default;
+ error_page 502 /502.html;
+ location /502.html {}
+}

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 3, 06:47 (19 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2277180
Default Alt Text
D3618.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator