View Options

	diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
	index 7e956f4..2b192f4 100644
	--- a/pillar/webserver/sites.sls
	+++ b/pillar/webserver/sites.sls
	@@ -1,107 +1,108 @@
	# -------------------------------------------------------------
	# Salt — Sites to provision on the legacy web server
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	# -------------------------------------------------------------
	# Domains we deploy
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	web_domains:
	#
	# Directly managed by Nasqueron
	#
	nasqueron:
	- nasqueron.org
	#
	# Nasqueron members
	#
	nasqueron_members:
	- dereckson.be
	#
	# Wolfplex
	#
	wolfplex:
	- wolfplex.be

	# -------------------------------------------------------------
	# Static sites
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	web_static_sites:
	nasqueron.org:
	- www
	- assets
	- docker
	- ftp
	+ - infra
	- trustspace

	# -------------------------------------------------------------
	# PHP sites
	#
	# Username must be unique and use max 31 characters.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	php_fpm_instances:
	# PHP 7.1, generally installed as package/port
	prod:
	command: /usr/local/sbin/php-fpm

	web_php_sites:
	# Nasqueron members
	www.dereckson.be:
	domain: dereckson.be
	subdomain: www
	user: web-be-dereckson-www
	source: wwwroot/dereckson.be/www
	target: /var/wwwroot/dereckson.be/www
	php-fpm: prod

	# Directly managed by Nasqueron
	api.nasqueron.org:
	domain: nasqueron.org
	subdomain: api
	user: web-org-nasqueron-api-serverslog
	php-fpm: prod
	env:
	SERVERS_LOG_FILE: /srv/api/data/servers-log-all.json

	# -------------------------------------------------------------
	# States
	#
	# Sites with states documenting how to build them
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	web_content_sls:
	#
	# Eglide
	#
	shellserver:
	# Third party sites hosted to Eglide
	- .com/paysannerebelle

	# Directly managed by Eglide project
	- .org/eglide

	#
	# Nasqueron servers
	#
	mastodon:
	- .org/nasqueron/social

	webserver-legacy:
	# Nasqueron members
	- .be/dereckson

	# Directly managed by Nasqueron
	- .org/nasqueron/api
	- .org/nasqueron/docs

	# -------------------------------------------------------------
	# Tweaks
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	web_autochmod:
	- /var/wwwroot/dereckson.be/www
	diff --git a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf
	new file mode 100644
	index 0000000..70ff7c3
	--- /dev/null
	+++ b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf
	@@ -0,0 +1,42 @@
	+# -------------------------------------------------------------
	+# Webserver
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+# Project: Nasqueron
	+# Site: infra.nasqueron.org
	+# License: Trivial work, not eligible to copyright
	+# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.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 infra.nasqueron.org;
	+
	+ include includes/letsencrypt;
	+
	+ return 301 https://infra.nasqueron.org$request_uri;
	+}
	+
	+server {
	+ server_name infra.nasqueron.org;
	+
	+ include includes/tls;
	+ ssl_certificate /usr/local/etc/letsencrypt/live/infra.nasqueron.org/fullchain.pem;
	+ ssl_certificate_key /usr/local/etc/letsencrypt/live/infra.nasqueron.org/privkey.pem;
	+
	+ error_log /var/log/www/nasqueron.org/infra-error.log;
	+ access_log /var/log/www/nasqueron.org/infra-access.log;
	+
	+ root /var/wwwroot/nasqueron.org/infra;
	+
	+ location = / {
	+ return 302 https://infra.nasqueron.org/servers-log/;
	+ }
	+}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Nov 24, 19:53 (9 h, 9 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2258858
Default Alt Text: (4 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions