diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls --- a/pillar/webserver/sites.sls +++ b/pillar/webserver/sites.sls @@ -37,6 +37,8 @@ # ------------------------------------------------------------- # Static sites +# +# Sites to deploy from the staging repository # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - web_static_sites: @@ -45,7 +47,6 @@ - assets - docker - ftp - - infra - packages - trustspace wolfplex.org: @@ -149,8 +150,11 @@ # Directly managed by Nasqueron - .org/nasqueron/api + - .org/nasqueron/daeghrefn - .org/nasqueron/docs + - .org/nasqueron/infra - .org/nasqueron/labs + - .org/nasqueron/rain # Wolfplex Hackerspace - .org/wolfplex/api diff --git a/roles/webserver-content/org/nasqueron/daeghrefn.sls b/roles/webserver-content/org/nasqueron/daeghrefn.sls new file mode 100644 --- /dev/null +++ b/roles/webserver-content/org/nasqueron/daeghrefn.sls @@ -0,0 +1,29 @@ +# ------------------------------------------------------------- +# Salt — Provision daeghrefn.nasqueron.org website +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Project: Nasqueron +# License: Trivial work, not eligible to copyright +# ------------------------------------------------------------- + +{% if salt['node.has_web_content'](".org/nasqueron/rain") %} + +# ------------------------------------------------------------- +# Base directory +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +/var/wwwroot/nasqueron.org/daeghrefn: + file.directory: + - user: deploy + - group: web + - dir_mode: 755 + +# ------------------------------------------------------------- +# Deploy rRAIN +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +www_daeghrefn_build: + module.run: + - name: jenkins.build_job + - m_name: deploy-website-nasqueron-www1-daeghrefn + +{% endif %} diff --git a/roles/webserver-content/org/nasqueron/docs.sls b/roles/webserver-content/org/nasqueron/docs.sls --- a/roles/webserver-content/org/nasqueron/docs.sls +++ b/roles/webserver-content/org/nasqueron/docs.sls @@ -34,6 +34,15 @@ - mode: 755 # ------------------------------------------------------------- +# Deploy rDWWW as docs.n.o homepage and assets +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +www_docs_build: + module.run: + - name: jenkins.build_job + - m_name: deploy-website-nasqueron-www1-docs + +# ------------------------------------------------------------- # Deploy a rSW docs dir HTML build to docs.n.o/salt-wrapper # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/roles/webserver-content/org/nasqueron/infra.sls b/roles/webserver-content/org/nasqueron/infra.sls new file mode 100644 --- /dev/null +++ b/roles/webserver-content/org/nasqueron/infra.sls @@ -0,0 +1,29 @@ +# ------------------------------------------------------------- +# Salt — Provision infra.nasqueron.org website +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Project: Nasqueron +# License: Trivial work, not eligible to copyright +# ------------------------------------------------------------- + +{% if salt['node.has_web_content'](".org/nasqueron/infra") %} + +# ------------------------------------------------------------- +# Base directory +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +/var/wwwroot/nasqueron.org/infra: + file.directory: + - user: deploy + - group: web + - dir_mode: 755 + +# ------------------------------------------------------------- +# Deploy rRAIN +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +www_infra_build: + module.run: + - name: jenkins.build_job + - m_name: deploy-website-nasqueron-www1-infra + +{% endif %} diff --git a/roles/webserver-content/org/nasqueron/rain.sls b/roles/webserver-content/org/nasqueron/rain.sls new file mode 100644 --- /dev/null +++ b/roles/webserver-content/org/nasqueron/rain.sls @@ -0,0 +1,29 @@ +# ------------------------------------------------------------- +# Salt — Provision rain.nasqueron.org website +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Project: Nasqueron +# License: Trivial work, not eligible to copyright +# ------------------------------------------------------------- + +{% if salt['node.has_web_content'](".org/nasqueron/rain") %} + +# ------------------------------------------------------------- +# Base directory +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +/var/wwwroot/nasqueron.org/rain: + file.directory: + - user: deploy + - group: web + - dir_mode: 755 + +# ------------------------------------------------------------- +# Deploy rRAIN +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +www_rain_build: + module.run: + - name: jenkins.build_job + - m_name: deploy-website-nasqueron-www1-rain + +{% endif %}