From 33237796544775a622e31dc86df3c9da6c737902 Mon Sep 17 00:00:00 2001 From: binary Date: Sat, 7 Nov 2020 20:40:29 +0100 Subject: Cleanup unused and old configurations --- group_vars/all/default.ini | 28 ---------------------------- group_vars/all/groups.ini | 19 ------------------- playbooks/p.yml | 12 ------------ playbooks/pf.yml | 8 -------- r | 4 ---- templates/CHV-DC-rainbow/etc/pf.conf.j2 | 4 ---- templates/dcontroller/etc/pf.conf.j2 | 4 ++++ templates/stack0/etc/pf.conf. | 1 + 8 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 group_vars/all/default.ini delete mode 100644 group_vars/all/groups.ini delete mode 100644 playbooks/p.yml delete mode 100644 playbooks/pf.yml delete mode 100755 r delete mode 100644 templates/CHV-DC-rainbow/etc/pf.conf.j2 create mode 100644 templates/dcontroller/etc/pf.conf.j2 create mode 100644 templates/stack0/etc/pf.conf. diff --git a/group_vars/all/default.ini b/group_vars/all/default.ini deleted file mode 100644 index 5f4cd2c..0000000 --- a/group_vars/all/default.ini +++ /dev/null @@ -1,28 +0,0 @@ -# SYSTEMD VARIABLES -g_systemd_unit_directory: /etc/systemd/system/ - -# PORT VARIABLES -g_port_ssh: 22 -g_port_http: 80 -g_port_https: 443 - -g_port_gitweb_gui: 16010 -g_port_mkdocs_gui: 16020 -g_port_syncthing_gui: 16030 -g_port_grafana_gui: 16090 -g_port_wireguard: 51100 -g_port_grafana: 51200 - -# IP VARIABLES -g_ip_mkdocs_gui: 0.0.0.0 - -# LOGGING VARIABLES -g_logging_directory: /var/REPLACEME - -# PACKAGES -package_curl: "curl" -package_neovim: "neovim" -package_tmux: "tmux" -package_wget: "wget" -package_zsh: "zsh" - diff --git a/group_vars/all/groups.ini b/group_vars/all/groups.ini deleted file mode 100644 index d5e173a..0000000 --- a/group_vars/all/groups.ini +++ /dev/null @@ -1,19 +0,0 @@ -[servers:vars] -package_curl="curl" -package_neovim="neovim" -package_tmux="tmux" -package_wget="wget" -package_zsh="zsh" - -[openbsd:vars] -group_root="wheel" -path_zsh_bin="/usr/local/bin/zsh" - -[centos:vars] -group_root="root" -path_zsh_bin="/bin/zsh" - -[debian:vars] -group_root="root" -path_zsh_bin="/bin/zsh" - diff --git a/playbooks/p.yml b/playbooks/p.yml deleted file mode 100644 index 0e37fb8..0000000 --- a/playbooks/p.yml +++ /dev/null @@ -1,12 +0,0 @@ - -# p.yml - ---- - -- hosts: "{{ host }}" - - tasks: - - - include_role: - name: "{{ role }}" - tasks_from: "{{ task }}" diff --git a/playbooks/pf.yml b/playbooks/pf.yml deleted file mode 100644 index 683cf69..0000000 --- a/playbooks/pf.yml +++ /dev/null @@ -1,8 +0,0 @@ - -# pf.yml -# pf for openbsd hosts. - -- hosts: openbsd - - roles: - - pf diff --git a/r b/r deleted file mode 100755 index 40017f9..0000000 --- a/r +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# Deploy roles - -ansible-playbook playbooks/p.yml -e "${1}" diff --git a/templates/CHV-DC-rainbow/etc/pf.conf.j2 b/templates/CHV-DC-rainbow/etc/pf.conf.j2 deleted file mode 100644 index 0269bda..0000000 --- a/templates/CHV-DC-rainbow/etc/pf.conf.j2 +++ /dev/null @@ -1,4 +0,0 @@ -# wireguard -pass in on egress inet proto udp from any to any port 50000 -pass out quick on egress inet from (tun0:network) nat-to (egress:0) - diff --git a/templates/dcontroller/etc/pf.conf.j2 b/templates/dcontroller/etc/pf.conf.j2 new file mode 100644 index 0000000..0269bda --- /dev/null +++ b/templates/dcontroller/etc/pf.conf.j2 @@ -0,0 +1,4 @@ +# wireguard +pass in on egress inet proto udp from any to any port 50000 +pass out quick on egress inet from (tun0:network) nat-to (egress:0) + diff --git a/templates/stack0/etc/pf.conf. b/templates/stack0/etc/pf.conf. new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/templates/stack0/etc/pf.conf. @@ -0,0 +1 @@ + -- cgit v1.2.3