Page MenuHomeDevCentral
Files F24894220

No OneTemporary
Actions

View Options

diff --git a/roles/core/network/ipv4.sls b/roles/core/network/ipv4.sls
index 3d794d7..54dd006 100644
--- a/roles/core/network/ipv4.sls
+++ b/roles/core/network/ipv4.sls
@@ -1,37 +1,36 @@
# -------------------------------------------------------------
# Salt — Network
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-06-15
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "roles/core/network/map.jinja" import interface_config with context %}
{% set network = salt['node.get']('network') %}
# -------------------------------------------------------------
# Interface
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% for interface_name, interface in network["interfaces"].items() %}
{% if "skip_interface_configuration" not in interface.get("flags", []) %}
network_ipv4_{{ interface_name }}:
file.managed:
{% if interface_config["suffix"] == "interface" %}
- name : {{ interface_config["config_path"] }}{{ interface_name }}
{% else %}
- name : {{ interface_config["config_path"] }}{{ interface["device"] }}
{% endif %}
- source: salt://roles/core/network/files/{{ interface_config["source_path"] }}
- makedirs: True
- template: jinja
- defaults:
interface: {{ interface }}
{% if grains['os_family'] == 'RedHat' %}
prefix: {{ salt['network_utils.netmask_to_cidr_prefix'](interface['ipv4']['netmask']) }}
{% endif %}
{% endif %}
{% endfor %}
-
diff --git a/roles/devserver/userland-home/files/dereckson/bin/arc-paste-diff b/roles/devserver/userland-home/files/dereckson/bin/arc-paste-diff
index 1fa87bd..6d734da 100755
--- a/roles/devserver/userland-home/files/dereckson/bin/arc-paste-diff
+++ b/roles/devserver/userland-home/files/dereckson/bin/arc-paste-diff
@@ -1,16 +1,15 @@
#!/usr/bin/env bash
COLORDIFF=`which colordiff`
if [ $# -ne 2 ]
then
echo "Usage: `basename $0` <paste 1> <paste 2>"
exit 1
fi
if [ "$COLORDIFF" = "" ]; then
diff -u <(arc paste $1) <(arc paste $2)
else
diff -u <(arc paste $1) <(arc paste $2) | colordiff
fi
-
diff --git a/roles/paas-docker/systemd-unit/files/docker_stop.sh b/roles/paas-docker/systemd-unit/files/docker_stop.sh
index 51ef7c5..298a9b9 100644
--- a/roles/paas-docker/systemd-unit/files/docker_stop.sh
+++ b/roles/paas-docker/systemd-unit/files/docker_stop.sh
@@ -1,20 +1,19 @@
#!/bin/sh
# -------------------------------------------------------------
# PaaS Docker
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2015-12-29
# License: Trivial work, not eligible to copyright
# Source file: roles/paas-docker/systemd-unit/files/docker_stop.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>
get-containers --reverse | xargs docker stop
-
diff --git a/roles/paas-docker/zemke-rhyne/directory.sls b/roles/paas-docker/zemke-rhyne/directory.sls
index d033416..a0a999c 100644
--- a/roles/paas-docker/zemke-rhyne/directory.sls
+++ b/roles/paas-docker/zemke-rhyne/directory.sls
@@ -1,14 +1,13 @@
# -------------------------------------------------------------
# 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/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf
index 9139f30..65ebce9 100644
--- a/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf
+++ b/roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf
@@ -1,32 +1,31 @@
# -------------------------------------------------------------
# Webserver
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Site: assets.nasqueron.org
# License: Trivial work, not eligible to copyright
# Source file: roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.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 assets.nasqueron.org;
include includes/tls;
ssl_certificate /usr/local/etc/letsencrypt/live/assets.nasqueron.org/fullchain.pem;
ssl_certificate_key /usr/local/etc/letsencrypt/live/assets.nasqueron.org/privkey.pem;
include includes/letsencrypt;
root /var/wwwroot/nasqueron.org/assets;
index index.html index.php index.htm;
}
-

File Metadata

Mime Type
text/x-diff
Expires
Wed, Mar 18, 12:44 (1 d, 17 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3524730
Default Alt Text
(5 KB)

Event Timeline

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