No OneTemporary
Actions

Size

27 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/UIDs b/UIDs
	index 21e555f..2ee899b 100644
	--- a/UIDs
	+++ b/UIDs
	@@ -1,10 +1,10 @@
	830 odderon
	831 builder
	832 chaton LEGACY
	833 viperserv
	834 tc2
	835 opensearch
	3004 mediawiki
	9001 salt
	9002 deploy
	-8900 zr
	+8900 zr LEGACY
	diff --git a/_modules/zr.py b/_modules/zr.py
	deleted file mode 100644
	index 50416f5..0000000
	--- a/_modules/zr.py
	+++ /dev/null
	@@ -1,166 +0,0 @@
	-# -- coding: utf-8 --
	-
	-# -------------------------------------------------------------
	-# Salt — Zemke-Rhyne module
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2018-09-11
	-# Description: Fetch Zemke-Rhyne credentials
	-# License: BSD-2-Clause
	-# -------------------------------------------------------------
	-
	-
	-import os
	-
	-from salt.utils.path import which as path_which
	-
	-
	-def __virtual__():
	- """
	- Only load if zr exists on the system
	- """
	- return (
	- path_which("zr") is not None,
	- "The Zemke-Rhyne execution module cannot be loaded: zr not installed.",
	- )
	-
	-
	-def _are_credentials_hidden():
	- return "CONFIG_PUBLISHER" in os.environ or "state.show_sls" in os.environ.get(
	- "SUDO_COMMAND", ""
	- )
	-
	-
	-def _build_pillar_key(expression):
	- return "zr_credentials:" + expression.replace(".", ":")
	-
	-
	-def _get_credential_id_from_pillar_key(expression):
	- """Gets credentials id from a dot pillar path, e.g. nasqueron.foo.bar"""
	- key = _build_pillar_key(expression)
	- return __salt__["pillar.get"](key)
	-
	-
	-def get_credential_id(expression):
	- try:
	- # Case I - expression is an integer
	- number = int(expression)
	-
	- if number < 1:
	- raise ValueError(expression, "A strictly positive integer was expected.")
	-
	- return number
	- except ValueError:
	- # Case II - expression is a pillar key
	- credential_id = _get_credential_id_from_pillar_key(expression)
	-
	- if credential_id is None or credential_id == "":
	- raise ValueError(expression, "Pillar key not found")
	-
	- return credential_id
	-
	-
	-def get_password(credential_expression):
	- """
	- A function to fetch credential through Zemke-Rhyne
	-
	-
	- CLI Example:
	-
	- salt equatower zr.get_password 124
	-
	- :param credential_expression: The credential number (K...) in Phabricator
	- or a key in zr_credentials pillar entry
	- :return: The secret value
	- """
	- if _are_credentials_hidden():
	- return "credential for " + credential_expression
	-
	- credential_id = get_credential_id(credential_expression)
	-
	- zr_command = "zr getcredentials {0}".format(credential_id)
	- return __salt__["cmd.shell"](zr_command)
	-
	-
	-def get_username(credential_expression):
	- """
	- A function to fetch the username associated to a credential
	- through Zemke-Rhyne
	-
	- CLI Example:
	-
	- salt equatower zr.get_username 124
	-
	- :param credential_expression: The credential number (K...) in Phabricator
	- or a key in zr_credentials pillar entry
	-
	- :return: The username
	- """
	- credential_id = get_credential_id(credential_expression)
	-
	- zr_command = "zr getcredentials {0} username".format(credential_id)
	- return __salt__["cmd.shell"](zr_command)
	-
	-
	-def get_token(credential_expression):
	- """
	- A function to fetch credential through Zemke-Rhyne
	-
	-
	- CLI Example:
	-
	- salt equatower zr.get_token 126
	-
	- :param credential_expression: The credential number (K...) in Phabricator
	- or a key in zr_credentials pillar entry
	- :return: The secret value
	- """
	- if _are_credentials_hidden():
	- return "credential for " + credential_expression
	-
	- credential_id = get_credential_id(credential_expression)
	-
	- zr_command = "zr getcredentials {0} token".format(credential_id)
	- return __salt__["cmd.shell"](zr_command)
	-
	-
	-def generate_random(secret_len):
	- """
	- A function to generate a random credential
	- """
	- if _are_credentials_hidden():
	- return "random credential"
	-
	- return __salt__["random.get_str"](secret_len)
	-
	-
	-def get_sentry_dsn(args):
	- sentry_server = _get_sentry_server(args["realm"])
	-
	- if _are_credentials_hidden():
	- return (
	- "https://[…]@"
	- + sentry_server
	- + "/"
	- + str(args["project_id"])
	- + " with credential for "
	- + args["credential"]
	- )
	-
	- return (
	- "https://"
	- + ":".join(
	- [
	- get_username(args["credential"]),
	- get_password(args["credential"]),
	- ]
	- )
	- + "@"
	- + sentry_server
	- + "/"
	- + str(args["project_id"])
	- )
	-
	-
	-def _get_sentry_server(realm):
	- return __pillar__["sentry_realms"][realm]["host"]
	diff --git a/pillar/credentials/zr.sls b/pillar/credentials/zr.sls
	deleted file mode 100644
	index 748b69f..0000000
	--- a/pillar/credentials/zr.sls
	+++ /dev/null
	@@ -1,122 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt configuration for Nasqueron servers
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2018-09-12
	-# License: Trivial work, not eligible to copyright
	-# -------------------------------------------------------------
	-
	-# -------------------------------------------------------------
	-# Zemke-Rhyne credentials
	-#
	-# Map K<id> on DevCentral with hierarchical keys
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-
	-zr_credentials:
	-
	- #
	- # Credentials used by Nasqueron services
	- #
	-
	- nasqueron:
	-
	- # login.nasqueron.org
	- auth-grove:
	- mysql: 67
	-
	- # status.nasqueron.org
	- cachet:
	- mysql: 47
	- app_key: 126
	-
	- # pad.nasqueron.org
	- etherpad:
	- # This API key is used by Wolfplex API to access to the pad lists
	- api: 125
	-
	- # notifications.nasqueron.org
	- notifications:
	- broker: 56
	- mailgun: 82
	- sentry: 141
	-
	- # OpenSearch clusters
	- opensearch:
	- infra-logs:
	- internal_users:
	- admin: 163
	- dashboards: 164
	-
	- # photos.nasqueron.org
	- pixelfed:
	- mysql: 142
	- app_key: 143
	- mailgun: 145
	-
	- # sentry.nasqueron.org
	- sentry:
	- postgresql: 139
	- app_key: 140
	-
	- #
	- # Credentials used by Nasqueron members private services
	- #
	-
	- dereckson:
	-
	- # River Sector
	- phabricator:
	- mysql: 133
	-
	- #
	- # Credentials used by Espace Win services
	- #
	-
	- espacewin:
	-
	- # bugzilla.espace-win.org
	- bugzilla:
	- mysql: 131
	-
	- #
	- # Credentials used by Wolfplex services
	- #
	-
	- wolfplex:
	-
	- # phabricator.wolfplex.be
	- phabricator:
	- mysql: 135
	- mailgun: 138
	-
	- #
	- # Credentials used by Zed services
	- #
	-
	- zed:
	-
	- # code.zed.dereckson.be
	- phabricator:
	- mysql: 134
	- sendgrid: 45
	-
	-# -------------------------------------------------------------
	-# Zemke-Rhyne clients
	-#
	-# This section should list all the Docker engines server
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-
	-zr_clients:
	- - key: 2
	- allowedConnectionFrom:
	- - 172.27.26.49
	- - dwellers.nasqueron.drake
	- - dwellers.nasqueron.org
	- restrictCommand:
	- comment: Zemke-Rhyne
	-
	- - key: 162
	- allowedConnectionFrom:
	- - cloudhugger.nasqueron.org
	- restrictCommand:
	- comment: Zemke-Rhyne
	diff --git a/pillar/top.sls b/pillar/top.sls
	index e2c9745..9e4ae50 100644
	--- a/pillar/top.sls
	+++ b/pillar/top.sls
	@@ -1,60 +1,57 @@
	# -------------------------------------------------------------
	# Salt configuration for Nasqueron servers
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2016-04-10
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	base:
	'*':
	- core.users
	- core.groups
	- core.network
	- certificates.certificates
	- nodes.nodes
	- nodes.forests
	- hotfixes.roles
	- webserver.sites

	cloudhugger:
	- - credentials.zr
	- opensearch.software
	- opensearch.clusters

	complector:
	- credentials.vault

	docker-002:
	- notifications.config
	- paas.docker
	- saas.jenkins
	- saas.phpbb
	- saas.sentry

	db-A-001:
	- dbserver.cluster-A

	dwellers:
	- - credentials.zr
	- paas.docker
	- saas.jenkins
	- saas.sentry

	eglide:
	- shellserver.quassel

	ysul:
	- devserver.repos
	- - credentials.zr
	- saas.mediawiki
	- viperserv.bots
	- viperserv.fantoir
	- webserver.labs
	- webserver.wwwroot51

	windriver:
	- devserver.ports
	- devserver.repos
	- webserver.labs
	- webserver.wwwroot51
	diff --git a/roles/opensearch/opensearch/wrapper.sls b/roles/opensearch/opensearch/wrapper.sls
	index 0542367..5e088a4 100644
	--- a/roles/opensearch/opensearch/wrapper.sls
	+++ b/roles/opensearch/opensearch/wrapper.sls
	@@ -1,33 +1,33 @@
	# -------------------------------------------------------------
	# Salt — Provision OpenSearch
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	{% set config = salt['opensearch.get_config']() %}

	# -------------------------------------------------------------
	# Wrapper for curl
	# Admin client for OpenSearch
	#
	# https://opensearch.org/docs/latest/opensearch/install/important-settings/
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	/usr/local/bin/es-query:
	file.managed:
	- source: salt://roles/opensearch/opensearch/files/es-query.sh.jinja
	- mode: 755
	- template: jinja
	- context:
	url: https://{{ config['network_host'] }}:9200

	/root/.opensearch-account:
	file.managed:
	- source: salt://roles/opensearch/opensearch/files/account.conf
	- mode: 600
	- template: jinja
	- show_changes: False
	- context:
	- username: {{ salt['zr.get_username'](config['users']['admin']) }}
	- password: {{ salt['zr.get_password'](config['users']['admin']) }}
	+ username: {{ salt['credential.get_username'](config['users']['admin']) }}
	+ password: {{ salt['credential.get_password'](config['users']['admin']) }}
	diff --git a/roles/paas-docker/containers/phabricator.sls b/roles/paas-docker/containers/phabricator.sls
	index 8c475dc..5541b3a 100644
	--- a/roles/paas-docker/containers/phabricator.sls
	+++ b/roles/paas-docker/containers/phabricator.sls
	@@ -1,85 +1,83 @@
	# -------------------------------------------------------------
	# Salt — Provision Docker engine
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2018-09-06
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	{% set has_selinux = salt['grains.get']('selinux:enabled', False) %}
	{% set containers = pillar['docker_containers'][grains['id']] %}

	{% for instance, container in containers['phabricator'].items() %}
	{% set create_container = "skip_container" not in container or not container['skip_container'] %}

	# -------------------------------------------------------------
	# Storage directory
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	/srv/phabricator/{{ instance }}:
	file.directory:
	- user: 431
	- group: 433
	- makedirs: True

	{% if has_selinux %}
	selinux_context_{{ instance }}_data:
	selinux.fcontext_policy_present:
	- name: /srv/phabricator/{{ instance }}
	- sel_type: container_file_t

	selinux_context_{{ instance }}_data_applied:
	selinux.fcontext_policy_applied:
	- name: /srv/phabricator/{{ instance }}
	{% endif %}

	# -------------------------------------------------------------
	# Container
	#
	# /!\ DEVCENTRAL DEPLOYMENT ISSUE /!\
	#
	-# We've currently a chicken or egg problem here: the zr
	-# credentials source is the Nasqueron Phabricator instance,
	-# DevCentral. As such, we can't provision it through this block.
	-#
	-# This is blocked by secrets migration to Vault.
	+# The DevCentral container is currently not managed
	+# by a reproducible Dockerfile. As such, this container
	+# is deployed manually from the registry. See T1547.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if create_container %}

	{{ instance }}:
	docker_container.running:
	- detach: True
	- interactive: True
	- image: nasqueron/phabricator
	- binds:
	- /srv/phabricator/{{ instance }}/conf:/opt/phabricator/conf
	- /srv/phabricator/{{ instance }}/repo:/var/repo
	- environment:
	PHABRICATOR_URL: https://{{ container['host'] }}
	PHABRICATOR_TITLE: {{ container['title'] }}
	PHABRICATOR_DOMAIN: {{ container['host'] }}
	PHABRICATOR_ALT_FILE_DOMAIN: https://{{ container['static_host'] }}

	DB_USER: {{ salt['credentials.get_username'](container['credentials']['mysql']) }}
	DB_PASS: {{ salt['credentials.get_password'](container['credentials']['mysql']) }}
	PHABRICATOR_STORAGE_NAMESPACE: {{ container['storage']['namespace'] }}

	{% if container['mailer'] == 'sendgrid' %}
	PHABRICATOR_USE_SENDGRID: 1
	PHABRICATOR_SENDGRID_APIUSER: {{ salt['credentials.get_username'](container['credentials']['sendgrid']) }}
	PHABRICATOR_SENDGRID_APIKEY: {{ salt['credentials.get_password'](container['credentials']['sendgrid']) }}
	{% elif container['mailer'] == 'mailgun' %}
	PHABRICATOR_USE_MAILGUN: 1
	PHABRICATOR_MAILGUN_APIKEY: {{ salt['credentials.get_token'](container['credentials']['mailgun']) }}
	{% endif %}

	- links: {{ container['mysql_link'] }}:mysql
	- ports:
	- 80
	- port_bindings:
	- {{ container['app_port'] }}:80

	{% endif %}

	{% endfor %}
	diff --git a/roles/paas-docker/init.sls b/roles/paas-docker/init.sls
	index 396fb3e..1108f7c 100644
	--- a/roles/paas-docker/init.sls
	+++ b/roles/paas-docker/init.sls
	@@ -1,28 +1,25 @@
	# -------------------------------------------------------------
	# Salt — Provision Docker engine
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2018-09-13
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	{% from "map.jinja" import dirs with context %}

	include:
	- .kernel
	- .salt
	- .docker
	- - .zemke-rhyne
	-{% if salt['file.file_exists'](dirs['bin'] + '/zr') %}
	- .containers
	-{% endif %}
	- .systemd-unit
	- .wwwroot-502
	- .wwwroot-content
	- .nginx
	- .monitoring
	- .letsencrypt
	- .wrappers
	{% if salt['node.has']('flags:install_docker_devel_tools') %}
	- .devel
	{% endif %}
	diff --git a/roles/paas-docker/zemke-rhyne/directory.sls b/roles/paas-docker/zemke-rhyne/directory.sls
	deleted file mode 100644
	index a0a999c..0000000
	--- a/roles/paas-docker/zemke-rhyne/directory.sls
	+++ /dev/null
	@@ -1,13 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt — Provision Docker engine
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2018-09-08
	-# License: Trivial work, not eligible to copyright
	-# -------------------------------------------------------------
	-
	-{% from "map.jinja" import dirs with context %}
	-
	-{{ dirs.etc }}/zr:
	- file.directory:
	- - mode: 700
	diff --git a/roles/paas-docker/zemke-rhyne/files/zr.sh b/roles/paas-docker/zemke-rhyne/files/zr.sh
	deleted file mode 100755
	index 546dc1e..0000000
	--- a/roles/paas-docker/zemke-rhyne/files/zr.sh
	+++ /dev/null
	@@ -1,26 +0,0 @@
	-#!/bin/sh
	-
	-# -------------------------------------------------------------
	-# PaaS Docker
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2018-09-08
	-# License: Trivial work, not eligible to copyright
	-# Source file: roles/paas-docker/zemke-rhyne/files/zr.sh
	-# -------------------------------------------------------------
	-#
	-# <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>
	-
	-ZR_SERVER="${ZR_SERVER:-ysul.nasqueron.org}"
	-
	-if [ "$#" -eq 0 ]; then
	- echo "Usage: $0 <command name> [options...]" 1>&2;
	- exit 1
	-fi
	-
	-ssh -4 -i /etc/zr/id_zr "zr@$ZR_SERVER" "$@"
	diff --git a/roles/paas-docker/zemke-rhyne/init.sls b/roles/paas-docker/zemke-rhyne/init.sls
	deleted file mode 100644
	index 2efa0d4..0000000
	--- a/roles/paas-docker/zemke-rhyne/init.sls
	+++ /dev/null
	@@ -1,40 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt — Provision Docker engine
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2018-09-08
	-# License: Trivial work, not eligible to copyright
	-#
	-# ___ ___ ___ ___ ___
	-# / /\ / /\ /__/\ /__/\| / /\
	-# / /::\| / /:/_ \| \|::\ \| \|:\| / /:/_
	-# / /:/:\| / /:/ /\ \| \|:\|:\ \| \|:\| / /:/ /\
	-# / /:/\|:\|__ / /:/ /:/_ __\|__\|:\|\:\ __\| \|:\| / /:/ /:/_
	-# /__/:/ \|:\| /\ /__/:/ /:/ /\ /__/::::\| \:\ /__/\_\|:\|____ /__/:/ /:/ /\
	-# \__\/ \|:\|/:/ \ \:\/:/ /:/ \ \:\~~\__\/ \ \:\/:::::/ \ \:\/:/ /:/
	-# \| \|:/:/ \ \::/ /:/ \ \:\ \ \::/~~~~ \ \::/ /:/
	-# \| \|::/ \ \:\/:/ \ \:\ \ \:\ \ \:\/:/
	-# \| \|:/ \ \::/ \ \:\ \ \:\ \ \::/
	-# \|__\|/ ___ \__\/ ___ \__\/ \__\/ ___ \__\/ ___
	-# / /\ /__/\ ___ /__/\ / /\
	-# / /::\ \ \:\ /__/\| \ \:\ / /:/_
	-# / /:/\:\ \__\:\ \| \|:\| \ \:\ / /:/ /\
	-# / /:/~/:/ ___ / /::\ \| \|:\| _____\__\:\ / /:/ /:/_
	-# /__/:/ /:/___ /__/\ /:/\:\ __\|__\|:\| /__/::::::::\ /__/:/ /:/ /\
	-# \ \:\/:::::/ \ \:\/:/__\/ /__/::::\ \ \:\~~\~~\/ \ \:\/:/ /:/
	-# \ \::/~~~~ \ \::/ ~\~~\:\ \ \:\ ~~~ \ \::/ /:/
	-# \ \:\ \ \:\ \ \:\ \ \:\ \ \:\/:/
	-# \ \:\ \ \:\ \__\/ \ \:\ \ \::/
	-# \__\/ \__\/ \__\/ \__\/
	-#
	-# Support tools for a Docker <--> Phabricator bridge.
	-#
	-# Use the Zemke-Rhyne account to build Docker containers for
	-# Nasqueron applications, fetching information from DevCentral.
	-#
	-# -------------------------------------------------------------
	-
	-include:
	- - .directory
	- - .key
	- - .utilities
	diff --git a/roles/paas-docker/zemke-rhyne/key.sls b/roles/paas-docker/zemke-rhyne/key.sls
	deleted file mode 100644
	index 0f355ff..0000000
	--- a/roles/paas-docker/zemke-rhyne/key.sls
	+++ /dev/null
	@@ -1,16 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt — Provision Docker engine
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2018-09-08
	-# License: Trivial work, not eligible to copyright
	-# -------------------------------------------------------------
	-
	-{% from "map.jinja" import dirs with context %}
	-
	-{% set key = dirs['etc'] + "/zr/id_zr" %}
	-
	-zr_key:
	- cmd.run:
	- - name: ssh-keygen -N '' -t ed25519 -f {{ key }}
	- - creates: {{ key }}
	diff --git a/roles/paas-docker/zemke-rhyne/utilities.sls b/roles/paas-docker/zemke-rhyne/utilities.sls
	deleted file mode 100644
	index 1d48833..0000000
	--- a/roles/paas-docker/zemke-rhyne/utilities.sls
	+++ /dev/null
	@@ -1,14 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt — Provision Docker engine
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2018-09-08
	-# License: Trivial work, not eligible to copyright
	-# -------------------------------------------------------------
	-
	-{% from "map.jinja" import dirs with context %}
	-
	-{{ dirs.bin }}/zr:
	- file.managed:
	- - source: salt://roles/paas-docker/zemke-rhyne/files/zr.sh
	- - mode: 755
	diff --git a/roles/salt-primary/zemke-rhyne/account.sls b/roles/salt-primary/zemke-rhyne/account.sls
	deleted file mode 100644
	index 3de7f3a..0000000
	--- a/roles/salt-primary/zemke-rhyne/account.sls
	+++ /dev/null
	@@ -1,25 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt — Provision Docker engine
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2017-04-28
	-# License: Trivial work, not eligible to copyright
	-# -------------------------------------------------------------
	-
	-{% from "map.jinja" import dirs with context %}
	-{% set zr_home = "/home/zr" %}
	-
	-# -------------------------------------------------------------
	-# Account
	-#
	-# This account is used by Jenkins jobs to deploy artifacts
	-# after a build.
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-
	-zr_account:
	- user.present:
	- - name: zr
	- - fullname: Zemke-Rhyne
	- - uid: 8900
	- - gid: 9002
	- - home: {{ zr_home }}
	diff --git a/roles/salt-primary/zemke-rhyne/data.sls b/roles/salt-primary/zemke-rhyne/data.sls
	deleted file mode 100644
	index b607c92..0000000
	--- a/roles/salt-primary/zemke-rhyne/data.sls
	+++ /dev/null
	@@ -1,29 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt — Provision Docker engine
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2018-09-08
	-# License: Trivial work, not eligible to copyright
	-# -------------------------------------------------------------
	-
	-{% set zr_home = "/home/zr" %}
	-
	-# If we pass the JSON as contents, it will be converted into Python,
	-# so we've a template to call directly the method.
	-
	-{{ zr_home }}/data/servers.json:
	- file.managed:
	- - source: salt://roles/salt-primary/zemke-rhyne/files/servers.json.jinja
	- - template: jinja
	- - user: zr
	-
	-zr_authorized_keys:
	- cmd.run:
	- - runas: zr
	- - cwd: {{ zr_home }}
	- - name: make clean all
	- - onchanges:
	- - file: {{ zr_home }}/data/servers.json
	- - require:
	- - user: zr_account
	- - file: {{ zr_home }}/Makefile
	diff --git a/roles/salt-primary/zemke-rhyne/files/dot.arcrc.json b/roles/salt-primary/zemke-rhyne/files/dot.arcrc.json
	deleted file mode 100644
	index 0f77312..0000000
	--- a/roles/salt-primary/zemke-rhyne/files/dot.arcrc.json
	+++ /dev/null
	@@ -1,5 +0,0 @@
	-{
	- "config": {
	- "default": "https://devcentral.nasqueron.org/"
	- }
	-}
	diff --git a/roles/salt-primary/zemke-rhyne/files/servers.json.jinja b/roles/salt-primary/zemke-rhyne/files/servers.json.jinja
	deleted file mode 100644
	index dc024c9..0000000
	--- a/roles/salt-primary/zemke-rhyne/files/servers.json.jinja
	+++ /dev/null
	@@ -1 +0,0 @@
	-{{ salt['convert.to_json_from_pillar_key']('zr_clients') }}
	diff --git a/roles/salt-primary/zemke-rhyne/init.sls b/roles/salt-primary/zemke-rhyne/init.sls
	deleted file mode 100644
	index 1e23c28..0000000
	--- a/roles/salt-primary/zemke-rhyne/init.sls
	+++ /dev/null
	@@ -1,40 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt — Provision Docker engine
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2017-04-28
	-# License: Trivial work, not eligible to copyright
	-# -------------------------------------------------------------
	-
	-# -------------------------------------------------------------
	-# But first, we interrupt your configuration for some ASCII art.
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-#
	-#
	-# ___ ___ ___ ___ ___
	-# / /\ / /\ /__/\ /__/\| / /\
	-# / /::\| / /:/_ \| \|::\ \| \|:\| / /:/_
	-# / /:/:\| / /:/ /\ \| \|:\|:\ \| \|:\| / /:/ /\
	-# / /:/\|:\|__ / /:/ /:/_ __\|__\|:\|\:\ __\| \|:\| / /:/ /:/_
	-# /__/:/ \|:\| /\ /__/:/ /:/ /\ /__/::::\| \:\ /__/\_\|:\|____ /__/:/ /:/ /\
	-# \__\/ \|:\|/:/ \ \:\/:/ /:/ \ \:\~~\__\/ \ \:\/:::::/ \ \:\/:/ /:/
	-# \| \|:/:/ \ \::/ /:/ \ \:\ \ \::/~~~~ \ \::/ /:/
	-# \| \|::/ \ \:\/:/ \ \:\ \ \:\ \ \:\/:/
	-# \| \|:/ \ \::/ \ \:\ \ \:\ \ \::/
	-# \|__\|/ ___ \__\/ ___ \__\/ \__\/ ___ \__\/ ___
	-# / /\ /__/\ ___ /__/\ / /\
	-# / /::\ \ \:\ /__/\| \ \:\ / /:/_
	-# / /:/\:\ \__\:\ \| \|:\| \ \:\ / /:/ /\
	-# / /:/~/:/ ___ / /::\ \| \|:\| _____\__\:\ / /:/ /:/_
	-# /__/:/ /:/___ /__/\ /:/\:\ __\|__\|:\| /__/::::::::\ /__/:/ /:/ /\
	-# \ \:\/:::::/ \ \:\/:/__\/ /__/::::\ \ \:\~~\~~\/ \ \:\/:/ /:/
	-# \ \::/~~~~ \ \::/ ~\~~\:\ \ \:\ ~~~ \ \::/ /:/
	-# \ \:\ \ \:\ \ \:\ \ \:\ \ \:\/:/
	-# \ \:\ \ \:\ \__\/ \ \:\ \ \::/
	-# \__\/ \__\/ \__\/ \__\/
	-#
	-
	-include:
	- - .account
	- - .software
	- - .data
	diff --git a/roles/salt-primary/zemke-rhyne/software.sls b/roles/salt-primary/zemke-rhyne/software.sls
	deleted file mode 100644
	index 285f485..0000000
	--- a/roles/salt-primary/zemke-rhyne/software.sls
	+++ /dev/null
	@@ -1,69 +0,0 @@
	-# -------------------------------------------------------------
	-# Salt — Provision Docker engine
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-# Project: Nasqueron
	-# Created: 2017-04-28
	-# License: Trivial work, not eligible to copyright
	-# -------------------------------------------------------------
	-
	-{% from "map.jinja" import dirs with context %}
	-{% set zr_home = "/home/zr" %}
	-
	-# -------------------------------------------------------------
	-# Required dependencies
	-#
	-# :: jq
	-# :: arc
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-
	-zr_required_sofware:
	- pkg.installed:
	- - pkgs:
	- - jq
	-
	- # Devserver role provides their own Git clone of Arcanist
	- # For other servers, we need the package.
	- {% if not salt['node.has_role']('devserver') %}
	- - arcanist
	- {% endif %}
	-
	-# -------------------------------------------------------------
	-# Deploy files and directory
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-
	-{% for dir in ['data', 'lib'] %}
	-{{ zr_home }}/{{ dir }}:
	- file.recurse:
	- - source: salt://software/zemke-rhyne/{{ dir }}
	- - include_empty: True
	- - clean: False
	- - dir_mode: 755
	- - file_mode: 644
	- - user: 8900
	- - group: 9002
	-{% endfor %}
	-
	-{{ zr_home }}/bin:
	- file.recurse:
	- - source: salt://software/zemke-rhyne/bin
	- - dir_mode: 755
	- - file_mode: 755
	- - user: 8900
	- - group: 9002
	-
	-{% for file in ['README', 'Makefile', '.arcconfig', '.arclint'] %}
	-{{ zr_home }}/{{ file }}:
	- file.managed:
	- - source: salt://software/zemke-rhyne/{{ file }}
	- - mode: 644
	- - user: 8900
	- - group: 9002
	-{% endfor %}
	-
	-{{ zr_home }}/.arcrc:
	- file.managed:
	- - source: salt://roles/webserver-legacy/zr/files/dot.arcrc.json
	- - replace: False
	- - mode: 600
	- - user: 8900
	- - group: 9002

File Metadata

Mime Type: text/x-diff
Expires: Mon, Nov 25, 13:54 (1 d, 8 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2256554
Default Alt Text: (27 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions