Page MenuHomeDevCentral
Files F3747848

D1777.diff
No OneTemporary
Actions

D1777.diff
View Options

diff --git a/PORTS b/PORTS
--- a/PORTS
+++ b/PORTS
@@ -3,6 +3,8 @@
9090 Openfire HTTP
22220 Phabricator Aphlict (client)
22221 Phabricator Aphlict (admin)
+ 24080 Tommy HTTP - CI
+ 24180 Tommy HTTP - CD
31080 Phabricator HTTP - DevCentral
34080 Etherpad
38080 Jenkins HTTP - CD
diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
--- a/pillar/paas/docker.sls
+++ b/pillar/paas/docker.sls
@@ -39,6 +39,7 @@
- jenkinsci/jenkins
- nasqueron/jenkins-slave-php
- nasqueron/jenkins-slave-rust
+ - dereckson/tommy
# -------------------------------------------------------------
# Networks
@@ -152,6 +153,19 @@
zenerre: *php_for_ci
+ tommy:
+ tommy_ci:
+ app_port: 24080
+ host: builds.nasqueron.org
+ aliases:
+ - build.nasqueron.org
+ jenkins_url: https://ci.nasqueron.org
+
+ tommy_cd:
+ # No host definition, as this dashboard is mounted on infra.nasqueron.org
+ app_port: 24180
+ jenkins_url: https://cd.nasqueron.org
+
# Infrastructure and development services
phabricator:
diff --git a/roles/paas-docker/containers/tommy.sls b/roles/paas-docker/containers/tommy.sls
new file mode 100644
--- /dev/null
+++ b/roles/paas-docker/containers/tommy.sls
@@ -0,0 +1,29 @@
+# -------------------------------------------------------------
+# Salt — Provision Docker engine
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2018-09-20
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% set containers = pillar['docker_containers'][grains['id']] %}
+
+{% for instance, container in containers['tommy'].items() %}
+
+# -------------------------------------------------------------
+# Container
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ instance }}:
+ docker_container.running:
+ - detach: True
+ - interactive: True
+ - image: dereckson/tommy
+ - environment:
+ - HUDSON_URL: {{ container['jenkins_url'] }}
+ - ports:
+ - 4567
+ - port_bindings:
+ - {{ container['app_port'] }}:4567 # HTTP
+
+{% endfor %}
diff --git a/roles/paas-docker/nginx/files/vhosts/tommy.conf b/roles/paas-docker/nginx/files/vhosts/tommy.conf
new file mode 100644
--- /dev/null
+++ b/roles/paas-docker/nginx/files/vhosts/tommy.conf
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------
+# Configuration for Docker PaaS front-end nginx
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Author: Sébastien Santoro aka Dereckson
+# Created: 2018-09-20
+# Source file: roles/paas-docker/nginx/files/vhosts/tommy.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 }} {{ aliases }};
+
+ include includes/letsencrypt;
+
+ return 301 https://$host$request_uri;
+}
+
+server {
+ server_name {{ fqdn }} {{ aliases }};
+
+ 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 / {
+ proxy_pass http://localhost:{{ app_port }};
+ include includes/proxy_params;
+ }
+
+}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 05:02 (19 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2248695
Default Alt Text
D1777.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