Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F11724577
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
7 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/pillar/webserver/wwwroot51.sls b/pillar/webserver/wwwroot51.sls
index fa9f6df..66eefdb 100644
--- a/pillar/webserver/wwwroot51.sls
+++ b/pillar/webserver/wwwroot51.sls
@@ -1,76 +1,76 @@
# -------------------------------------------------------------
# Salt — Sites to provision on the devserver wwwroot51
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
wwwroot51_basedir: /var/51-wwwroot
-wwwroot51_identities:
+wwwroot_identities:
alken-orin:
secret: nasqueron/deploy/deploy_keys/alken-orin
path: /opt/salt/security/id_alken_orin_ed25519
deploy-key-bitbucket-dereckson-www:
secret: nasqueron/deploy/deploy_keys/by_repo/bitbucket/dereckson/www
path: /opt/salt/security/id_bitbucket_dereckson_www
deploy-key-bitbucket-espacewin-www:
secret: nasqueron/deploy/deploy_keys/by_repo/bitbucket/ewosp/www
path: /opt/salt/security/id_bitbucket_espacewin_www
deploy-key-github-wolfplex-api-www:
secret: nasqueron/deploy/deploy_keys/by_repo/github/wolfplex/api-www
path: /opt/salt/security/id_github_wolfplex_api_www
wwwroot51_directories:
api:
user: dereckson
group: dereckson
repository: ssh://vcs@devcentral.nasqueron.org:5022/source/api.git
identity: alken-orin
dereckson-www:
user: dereckson
group: dereckson
repository: git@bitbucket.org:dereckson/www.dereckson.be.git
identity: deploy-key-bitbucket-dereckson-www
espacewin-www:
user: dereckson
group: dereckson
repository: git@bitbucket.org:ewosp/www.espace-win.org.git
identity: deploy-key-bitbucket-espacewin-www
mediawiki-dereckson:
user: dereckson
group: dereckson
rain:
user: dereckson
group: dereckson
saas-mediawiki:
user: dereckson
group: mediawiki
repository: ssh://vcs@devcentral.nasqueron.org:5022/source/saas-mediawiki.git
identity: alken-orin
tools:
user: dereckson
group: dereckson
repository: ssh://vcs@devcentral.nasqueron.org:5022/source/tools.git
identity: alken-orin
wolfplex-api:
user: dereckson
group: dereckson
repository: git@github.com:wolfplex/api-www.git
identity: deploy-key-github-wolfplex-api-www
www:
user: dereckson
group: dereckson
repository: ssh://vcs@devcentral.nasqueron.org:5022/source/www.git
identity: alken-orin
diff --git a/roles/devserver/webserver-wwwroot51/init.sls b/roles/devserver/webserver-wwwroot51/init.sls
index 4f702a2..a9facad 100644
--- a/roles/devserver/webserver-wwwroot51/init.sls
+++ b/roles/devserver/webserver-wwwroot51/init.sls
@@ -1,10 +1,10 @@
# -------------------------------------------------------------
# Salt — Webserver wwwroot51 content
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- - .credentials
+ - roles/webserver-alkane/credentials
- .sites
diff --git a/roles/devserver/webserver-wwwroot51/sites.sls b/roles/devserver/webserver-wwwroot51/sites.sls
index 0af4029..ba62369 100644
--- a/roles/devserver/webserver-wwwroot51/sites.sls
+++ b/roles/devserver/webserver-wwwroot51/sites.sls
@@ -1,69 +1,69 @@
# -------------------------------------------------------------
# Salt — Webserver wwwroot51 content
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% set basedir = pillar['wwwroot51_basedir'] %}
# -------------------------------------------------------------
# Base directory
#
# If ZFS is available, create a volume with frequent snapshots
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ basedir }}:
file.directory:
- dir_mode: 711
- user: deploy
{% if salt['node.has']('zfs:pool') %}
{% set tank = salt['node.get']("zfs:pool") %}
{{ tank }}/wwwroot51:
zfs.filesystem_present:
- properties:
mountpoint: {{ basedir }}
compression: zstd
"com.sun:auto-snapshot": "true"
{% endif %}
# -------------------------------------------------------------
# 51 sites
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{% set identities = pillar["wwwroot51_identities"] %}
+{% set identities = pillar["wwwroot_identities"] %}
{% for sitename, site in pillar['wwwroot51_directories'].items() %}
{{ basedir }}/{{ sitename }}:
file.directory:
- dir_mode: 711
{% if 'repository' not in site %}
- user: {{ site['user'] }}
- group: {{ site['group'] }}
{% else %}
# Credentials belong to deploy user
- user: deploy
git.latest:
- name: {{ site['repository'] }}
- target: {{ basedir }}/{{ sitename }}
- user: deploy
- identity: {{ identities[site["identity"]]["path"] }}
- update_head: False
fix_rights_{{ basedir }}/{{ sitename }}:
file.directory:
- name: {{ basedir }}/{{ sitename }}
- user: {{ site['user'] }}
- group: {{ site['group'] }}
- recurse:
- user
- group
- onchanges:
- git: {{ basedir }}/{{ sitename }}
{% endif %}
{% endfor %}
diff --git a/roles/devserver/webserver-wwwroot51/credentials.sls b/roles/webserver-alkane/credentials/init.sls
similarity index 88%
rename from roles/devserver/webserver-wwwroot51/credentials.sls
rename to roles/webserver-alkane/credentials/init.sls
index 9939808..ca7befb 100644
--- a/roles/devserver/webserver-wwwroot51/credentials.sls
+++ b/roles/webserver-alkane/credentials/init.sls
@@ -1,33 +1,33 @@
# -------------------------------------------------------------
-# Salt — Webserver wwwroot51 content
+# Salt — Webserver content
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
/opt/salt/security:
file.directory:
- user: deploy
- makedirs: True
- mode: 700
-{% for _, identity in pillar.get("wwwroot51_identities", {}).items() %}
+{% for _, identity in pillar.get("wwwroot_identities", {}).items() %}
{{ identity["path"] }}:
file.managed:
- user: deploy
- mode: 400
- source: salt://roles/devserver/webserver-wwwroot51/files/id_private
- template: jinja
- context:
secret: {{ identity["secret"] }}
- show_changes: False
{{ identity["path"] }}.pub:
file.managed:
- user: deploy
- mode: 444
- contents: |
{{ salt["credentials.get_username"](identity["secret"]) }}
- show_changes: False
{% endfor %}
diff --git a/roles/webserver-alkane/init.sls b/roles/webserver-alkane/init.sls
index 8f95169..6b4c656 100644
--- a/roles/webserver-alkane/init.sls
+++ b/roles/webserver-alkane/init.sls
@@ -1,12 +1,13 @@
# -------------------------------------------------------------
# Salt :: Alkane :: Nasqueron PaaS for static and PHP sites
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- .account
- .alkane
+ - .credentials
- .directories
- .php
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Thu, Sep 18, 16:13 (17 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2991066
Default Alt Text
(7 KB)
Attached To
Mode
rOPS Nasqueron Operations
Attached
Detach File
Event Timeline
Log In to Comment