Page MenuHomeDevCentral
Files F22374592

No OneTemporary
Actions

View Options

diff --git a/roles/webserver-content/org/nasqueron/api.sls b/roles/webserver-content/org/nasqueron/api.sls
index ef31271..80f31e3 100644
--- a/roles/webserver-content/org/nasqueron/api.sls
+++ b/roles/webserver-content/org/nasqueron/api.sls
@@ -1,57 +1,68 @@
# -------------------------------------------------------------
# Salt — Provision api.nasqueron.org website
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% if salt['node.has_web_content'](".org/nasqueron/api") %}
# -------------------------------------------------------------
# Base part from rOPS
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/var/wwwroot/nasqueron.org/api:
file.recurse:
- source: salt://wwwroot/nasqueron.org/api
- exclude_pat: E@.git
- include_empty: True
- clean: False
- dir_mode: 755
- file_mode: 644
- user: deploy
- group: web
# -------------------------------------------------------------
# API micro services are deployed to /srv/api
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/srv/api:
file.directory:
- user: deploy
- group: web
- dir_mode: 755
+/srv/api/data:
+ file.directory:
+ - user: deploy
+ - group: web
+ - dir_mode: 755
+
# -------------------------------------------------------------
# /servers-log micro service
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/srv/api/servers-log:
file.recurse:
- source: salt://software/api/serverslog
- exclude_pat: E@.git
- include_empty: True
- clean: False
- dir_mode: 755
- file_mode: 644
- user: deploy
- group: web
api_servers_log_dependencies:
cmd.run:
- name: composer install
- runas: deploy
- cwd: /srv/api/servers-log
- creates: /srv/api/servers-log/vendor
+/srv/api/data/servers-log-all.json:
+ file.managed:
+ - user: web-org-nasqueron-api-serverslog
+ - mode: 644
+
{% endif %}
diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
index cd6d38c..396d0bd 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
+++ b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf
@@ -1,69 +1,79 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: api.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.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 api.nasqueron.org;
return 301 https://api.nasqueron.org$request_uri;
}
server {
server_name api.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/api.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/api.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/api-error.log;
access_log /var/log/www/nasqueron.org/api-access.log;
root /var/wwwroot/nasqueron.org/api;
include includes/letsencrypt;
location ~ [^/]\.json(/|$) {
include includes/cors-open;
}
+
+ location = /servers-log/all.json {
+ include includes/cors-open;
+ alias /srv/api/data/servers-log-all.json;
+ }
}
server {
listen 80;
listen [::]:80;
server_name api51.nasqueron.org;
include includes/letsencrypt;
return 301 https://api51.nasqueron.org$request_uri;
}
server {
server_name api51.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/www51.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/www51.nasqueron.org/privkey.pem;
error_log /var/log/www/nasqueron.org/api51-error.log;
access_log /var/log/www/nasqueron.org/api51-access.log;
root /var/51-wwwroot/api;
location ~ [^/]\.json(/|$) {
include includes/cors-open;
}
+
+ location = /servers-log/all.json {
+ include includes/cors-open;
+ alias /tmp/servers-log-all.json;
+ }
}

File Metadata

Mime Type
text/x-diff
Expires
Fri, Jan 30, 06:06 (15 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3399685
Default Alt Text
(4 KB)

Event Timeline

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