actcur/salt
3
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

Added VPN server config, fixed deluge config and backups

Browse source
This commit is contained in:
Beth Parker 2017-09-05 22:33:09 -05:00
parent 2228c6e7a9
commit a4bbe66416
12 changed files with 518 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pillars/roles/backup/deluge.sls Normal file
View file

@ -0,0 +1,13 @@
backup:
deluge:
location: /srv/deluge
rsync_user: backups
key: backups_key
host: host.actcur.com
user: deluge
group: deluge
fmode: 644
dmode: 755
services:
- deluged
- deluge-web

5
pillars/roles/ca/vpnclients.sls Normal file
View file

@ -0,0 +1,5 @@
ca:
standesk:
type: client
masau-llm.actcur.com:
type: client

4
pillars/roles/ca/vpnserver.sls
View file

@ -2,12 +2,12 @@ ca:
vpn.actcur.com:
type: server
priv-locations:
/etc/openvpn/server/vpn.actcur.com.key:
/etc/openvpn/server/server.key:
user: root
group: root
mode: 400
cert-locations:
/etc/openvpn/server/vpn.actcur.com.crt:
/etc/openvpn/server/server.crt:
user: root
group: root
mode: 400

8
pillars/roles/mount/saltmaster.sls
View file

@ -4,11 +4,7 @@ mount:
host: host.actcur.com
directory: /mnt/butter/backups/configurations
user: backups
/secure/ca/issued:
/secure/ca/:
host: ca.actcur.com
directory: /etc/easy-rsa/pki/issued
user: ca
/secure/ca/private:
host: ca.actcur.com
directory: /etc/easy-rsa/pki/private
directory: /etc/easy-rsa/pki/
user: ca

6
pillars/roles/nginx/deluge.sls Normal file
View file

@ -0,0 +1,6 @@
nginx:
deluge:
auth: none
https:
port: 8112
prot: http

2
pillars/servers/roles/server/archdeluge.sls
View file

@ -4,4 +4,4 @@ grains:
- ssh
- saltminion
- deluge
# - nfs
- nginx-proxy

10
states/roles/maintain/ca/init.sls
View file

@ -22,7 +22,7 @@ gen-ca-key:
{%- for name in pillar['ca'] %}
gen-{{name}}-cert:
cmd.run:
- name: "easyrsa --batch --vars=./vars gen-req {{name}} nopass;easyrsa --batch --vars=./vars sign-req {{pillar['ca'][name]['type']}} {{name}};"
- name: "easyrsa --batch --vars=./vars --req-cn={{name}} gen-req {{name}} nopass;easyrsa --batch --vars=./vars sign-req {{pillar['ca'][name]['type']}} {{name}};"
- cwd: "/etc/easy-rsa"
- onlyif: 'test ! -e /etc/easy-rsa/pki/reqs/{{name}}.req'
#set ownership to root:ca and mod to 640
@ -31,11 +31,13 @@ gen-{{name}}-cert:
- name: /etc/easy-rsa/pki/issued/{{name}}.crt
- group: ca
- mode: 640
- replace: false
{{name}}-key-perms:
file.managed:
- name: /etc/easy-rsa/pki/private/{{name}}.key
- group: ca
- mode: 640
- replace: false
{%- endfor %}
{%- endif %}
#set directory perms
@ -54,3 +56,9 @@ private-perms:
- name: /etc/easy-rsa/pki/private
- group: ca
- mode: 750
ca-cert-perms:
file.managed:
- name: /etc/easy-rsa/pki/ca.crt
- group: ca
- mode: 640
- replace: false

91
states/roles/maintain/deluge/init.sls
View file

@ -1,64 +1,21 @@
{%- set os=grains['os'] -%}
include:
- systems.extra.nfs_client
deluge:
pkg.installed
python2-mako:
pkg.installed
mount:
group.present:
- gid: 503
- addusers:
- deluge
fuse:
pkg.installed
sshfs:
pkg.installed
{% if not salt['file.directory_exists']('/srv/deluge/.config/deluge') %}
/srv/deluge/.config/deluge:
# file.directory:
#This should be handled by backup and restore states
#{% if not salt['file.directory_exists']('/srv/deluge/.config/deluge') %}
#/srv/deluge/.config/deluge:
# file.recurse:
# - source: salt://backups/deluge
# - user: deluge
# - group: deluge
# - mode: 755
# - makedirs: true
# - recurse:
# - user
# - group
# - mode
file.recurse:
- source: salt://roles/maintain/deluge/deluge
- user: deluge
- group: deluge
- dir_mode: 0755
- file_mode: 0644
{% endif %}
/mnt/video:
mount.mounted:
- device: mount@host.s.mpp:/mnt/butter/video
- fstype: fuse.sshfs
- mkmnt: True
- opts: delay_connect,x-systemd.automount,_netdev,user,idmap=user,IdentityFile=/root/.ssh/mount_rsa,allow_other,reconnect
- dump: 0
- pass_num: 2
- persist: True
#mount@host.s.mpp:/mnt/butter/video /mnt/video fuse.sshfs noauto,x-systemd.automount,_netdev,users,idmap=user,IdentityFile=/root/.ssh/mount_rsa,allow_other,reconnect 0 0
#/mnt/video:
# mount.mounted:
# - device: host.s.mpp:/video
# - fstype: nfs
# - mkmnt: True
# - opts: defaults,x-systemd.timeout=10,x-systemd.automount
# - dump: 0
# - pass_num: 2
# - dir_mode: 0755
# - file_mode: 0644
#{% endif %}
deluged:
service.running:
@ -67,35 +24,3 @@ deluged:
deluge-web:
service.running:
- enable: true
nginx:
pkg.installed: []
service.running:
- enable: true
- watch:
- file: /etc/nginx/conf.d/*
- file: /etc/nginx/nginx.conf
- file: /etc/nginx/cert.pem
/etc/nginx/cert.pem:
file.managed:
- source: salt://roles/maintain/deluge/nginx.conf
- user: http
- group: http
- mode: 400
/etc/nginx/nginx.conf:
file.managed:
- source: salt://roles/maintain/deluge/nginx.conf
- user: root
- group: root
- mode: 644
/etc/nginx/conf.d/:
file.recurse:
- source: salt://roles/maintain/deluge/conf.d/
- user: root
- group: root
- dir_mode: 755
- file_mode: 644
- clean: true

128
states/roles/maintain/vpnserver/client.conf Normal file
View file

@ -0,0 +1,128 @@
##############################################
# Sample client-side OpenVPN 2.0 config file #
# for connecting to multi-client server. #
# #
# This configuration can be used by multiple #
# clients, however each client should have #
# its own cert and key files. #
# #
# On Windows, you might want to rename this #
# file so it has a .ovpn extension #
##############################################
# Specify that we are a client and that we
# will be pulling certain config file directives
# from the server.
client
# Use the same setting as you are using on
# the server.
# On most systems, the VPN will not function
# unless you partially or fully disable
# the firewall for the TUN/TAP interface.
;dev tap
dev tun
# Windows needs the TAP-Win32 adapter name
# from the Network Connections panel
# if you have more than one. On XP SP2,
# you may need to disable the firewall
# for the TAP adapter.
;dev-node MyTap
# Are we connecting to a TCP or
# UDP server? Use the same setting as
# on the server.
;proto tcp
proto udp
# The hostname/IP and port of the server.
# You can have multiple remote entries
# to load balance between the servers.
remote vpn.actcur.com 1194
;remote my-server-2 1194
# Choose a random host from the remote
# list for load-balancing. Otherwise
# try hosts in the order specified.
;remote-random
# Keep trying indefinitely to resolve the
# host name of the OpenVPN server. Very useful
# on machines which are not permanently connected
# to the internet such as laptops.
resolv-retry infinite
# Most clients don't need to bind to
# a specific local port number.
nobind
# Downgrade privileges after initialization (non-Windows only)
user nobody
group nobody
# Try to preserve some state across restarts.
persist-key
persist-tun
# If you are connecting through an
# HTTP proxy to reach the actual OpenVPN
# server, put the proxy server/IP and
# port number here. See the man page
# if your proxy server requires
# authentication.
;http-proxy-retry # retry on connection failures
;http-proxy [proxy server] [proxy port #]
# Wireless networks often produce a lot
# of duplicate packets. Set this flag
# to silence duplicate packet warnings.
;mute-replay-warnings
# SSL/TLS parms.
# See the server config file for more
# description. It's best to use
# a separate .crt/.key file pair
# for each client. A single ca
# file can be used for all clients.
ca ca.crt
cert client.crt
key client.key
# Verify server certificate by checking that the
# certicate has the correct key usage set.
# This is an important precaution to protect against
# a potential attack discussed here:
# http://openvpn.net/howto.html#mitm
#
# To use this feature, you will need to generate
# your server certificates with the keyUsage set to
# digitalSignature, keyEncipherment
# and the extendedKeyUsage to
# serverAuth
# EasyRSA can do this for you.
remote-cert-tls server
# If a tls-auth key is used on the server
# then every client must also have the key.
tls-crypt ta.key
;tls-auth ta.key 1
# Select a cryptographic cipher.
# If the cipher option is used on the server
# then you must also specify it here.
# Note that 2.4 client/server will automatically
# negotiate AES-256-GCM in TLS mode.
# See also the ncp-cipher option in the manpage
cipher AES-256-CBC
# Enable compression on the VPN link.
# Don't enable this unless it is also
# enabled in the server config file.
#comp-lzo
# Set log file verbosity.
verb 3
# Silence repeating messages
;mute 20

24
states/roles/maintain/vpnserver/init.sls
View file

@ -15,3 +15,27 @@ gen-hmac-key:
cmd.run:
- name: "openvpn --genkey --secret /etc/openvpn/server/ta.key"
- onlyif: 'test ! -e /etc/openvpn/server/ta.key'
vpn-server-conf:
file.managed:
- name: /etc/openvpn/server/server.conf
- source: salt://roles/maintain/vpnserver/server.conf
- user: root
- group: root
- mode: 644
vpn-client-conf:
file.managed:
- name: /etc/openvpn/client/client.conf
- source: salt://roles/maintain/vpnserver/client.conf
- user: root
- group: root
- mode: 644
vpn-ca-cert:
file.managed:
- name: /etc/openvpn/server/ca.crt
- source: salt://secure/ca/ca.crt
- user: root
- group: root
- mode: 644

319
states/roles/maintain/vpnserver/server.conf Normal file
View file

@ -0,0 +1,319 @@
#################################################
# Sample OpenVPN 2.0 config file for #
# multi-client server. #
# #
# This file is for the server side #
# of a many-clients <-> one-server #
# OpenVPN configuration. #
# #
# OpenVPN also supports #
# single-machine <-> single-machine #
# configurations (See the Examples page #
# on the web site for more info). #
# #
# This config should work on Windows #
# or Linux/BSD systems. Remember on #
# Windows to quote pathnames and use #
# double backslashes, e.g.: #
# "C:\\Program Files\\OpenVPN\\config\\foo.key" #
# #
# Comments are preceded with '#' or ';' #
#################################################
# Which local IP address should OpenVPN
# listen on? (optional)
;local a.b.c.d
# Which TCP/UDP port should OpenVPN listen on?
# If you want to run multiple OpenVPN instances
# on the same machine, use a different port
# number for each one. You will need to
# open up this port on your firewall.
port 1194
# TCP or UDP server?
;proto tcp
proto udp
# "dev tun" will create a routed IP tunnel,
# "dev tap" will create an ethernet tunnel.
# Use "dev tap0" if you are ethernet bridging
# and have precreated a tap0 virtual interface
# and bridged it with your ethernet interface.
# If you want to control access policies
# over the VPN, you must create firewall
# rules for the the TUN/TAP interface.
# On non-Windows systems, you can give
# an explicit unit number, such as tun0.
# On Windows, use "dev-node" for this.
# On most systems, the VPN will not function
# unless you partially or fully disable
# the firewall for the TUN/TAP interface.
;dev tap
dev tun
# Windows needs the TAP-Win32 adapter name
# from the Network Connections panel if you
# have more than one. On XP SP2 or higher,
# you may need to selectively disable the
# Windows firewall for the TAP adapter.
# Non-Windows systems usually don't need this.
;dev-node MyTap
# SSL/TLS root certificate (ca), certificate
# (cert), and private key (key). Each client
# and the server must have their own cert and
# key file. The server and all clients will
# use the same ca file.
#
# See the "easy-rsa" directory for a series
# of scripts for generating RSA certificates
# and private keys. Remember to use
# a unique Common Name for the server
# and each of the client certificates.
#
# Any X509 key management system can be used.
# OpenVPN can also use a PKCS #12 formatted key file
# (see "pkcs12" directive in man page).
ca ca.crt
cert server.crt
key server.key # This file should be kept secret
# Diffie hellman parameters.
# Generate your own with:
# openssl dhparam -out dh2048.pem 2048
dh dh.pem
# Network topology
# Should be subnet (addressing via IP)
# unless Windows clients v2.0.9 and lower have to
# be supported (then net30, i.e. a /30 per client)
# Defaults to net30 (not recommended)
;topology subnet
# Configure server mode and supply a VPN subnet
# for OpenVPN to draw client addresses from.
# The server will take 10.8.0.1 for itself,
# the rest will be made available to clients.
# Each client will be able to reach the server
# on 10.8.0.1. Comment this line out if you are
# ethernet bridging. See the man page for more info.
server 10.8.0.0 255.255.255.0
# Maintain a record of client <-> virtual IP address
# associations in this file. If OpenVPN goes down or
# is restarted, reconnecting clients can be assigned
# the same virtual IP address from the pool that was
# previously assigned.
ifconfig-pool-persist ipp.txt
# Configure server mode for ethernet bridging.
# You must first use your OS's bridging capability
# to bridge the TAP interface with the ethernet
# NIC interface. Then you must manually set the
# IP/netmask on the bridge interface, here we
# assume 10.8.0.4/255.255.255.0. Finally we
# must set aside an IP range in this subnet
# (start=10.8.0.50 end=10.8.0.100) to allocate
# to connecting clients. Leave this line commented
# out unless you are ethernet bridging.
;server-bridge 10.8.0.4 255.255.255.0 10.8.0.50 10.8.0.100
# Configure server mode for ethernet bridging
# using a DHCP-proxy, where clients talk
# to the OpenVPN server-side DHCP server
# to receive their IP address allocation
# and DNS server addresses. You must first use
# your OS's bridging capability to bridge the TAP
# interface with the ethernet NIC interface.
# Note: this mode only works on clients (such as
# Windows), where the client-side TAP adapter is
# bound to a DHCP client.
;server-bridge
# Push routes to the client to allow it
# to reach other private subnets behind
# the server. Remember that these
# private subnets will also need
# to know to route the OpenVPN client
# address pool (10.8.0.0/255.255.255.0)
# back to the OpenVPN server.
;push "route 192.168.10.0 255.255.255.0"
;push "route 192.168.20.0 255.255.255.0"
# To assign specific IP addresses to specific
# clients or if a connecting client has a private
# subnet behind it that should also have VPN access,
# use the subdirectory "ccd" for client-specific
# configuration files (see man page for more info).
# EXAMPLE: Suppose the client
# having the certificate common name "Thelonious"
# also has a small subnet behind his connecting
# machine, such as 192.168.40.128/255.255.255.248.
# First, uncomment out these lines:
;client-config-dir ccd
;route 192.168.40.128 255.255.255.248
# Then create a file ccd/Thelonious with this line:
# iroute 192.168.40.128 255.255.255.248
# This will allow Thelonious' private subnet to
# access the VPN. This example will only work
# if you are routing, not bridging, i.e. you are
# using "dev tun" and "server" directives.
# EXAMPLE: Suppose you want to give
# Thelonious a fixed VPN IP address of 10.9.0.1.
# First uncomment out these lines:
;client-config-dir ccd
;route 10.9.0.0 255.255.255.252
# Then add this line to ccd/Thelonious:
# ifconfig-push 10.9.0.1 10.9.0.2
# Suppose that you want to enable different
# firewall access policies for different groups
# of clients. There are two methods:
# (1) Run multiple OpenVPN daemons, one for each
# group, and firewall the TUN/TAP interface
# for each group/daemon appropriately.
# (2) (Advanced) Create a script to dynamically
# modify the firewall in response to access
# from different clients. See man
# page for more info on learn-address script.
;learn-address ./script
# If enabled, this directive will configure
# all clients to redirect their default
# network gateway through the VPN, causing
# all IP traffic such as web browsing and
# and DNS lookups to go through the VPN
# (The OpenVPN server machine may need to NAT
# or bridge the TUN/TAP interface to the internet
# in order for this to work properly).
;push "redirect-gateway def1 bypass-dhcp"
# Certain Windows-specific network settings
# can be pushed to clients, such as DNS
# or WINS server addresses. CAVEAT:
# http://openvpn.net/faq.html#dhcpcaveats
# The addresses below refer to the public
# DNS servers provided by opendns.com.
;push "dhcp-option DNS 208.67.222.222"
;push "dhcp-option DNS 208.67.220.220"
# Uncomment this directive to allow different
# clients to be able to "see" each other.
# By default, clients will only see the server.
# To force clients to only see the server, you
# will also need to appropriately firewall the
# server's TUN/TAP interface.
;client-to-client
# Uncomment this directive if multiple clients
# might connect with the same certificate/key
# files or common names. This is recommended
# only for testing purposes. For production use,
# each client should have its own certificate/key
# pair.
#
# IF YOU HAVE NOT GENERATED INDIVIDUAL
# CERTIFICATE/KEY PAIRS FOR EACH CLIENT,
# EACH HAVING ITS OWN UNIQUE "COMMON NAME",
# UNCOMMENT THIS LINE OUT.
;duplicate-cn
# The keepalive directive causes ping-like
# messages to be sent back and forth over
# the link so that each side knows when
# the other side has gone down.
# Ping every 10 seconds, assume that remote
# peer is down if no ping received during
# a 120 second time period.
keepalive 10 120
# For extra security beyond that provided
# by SSL/TLS, create an "HMAC firewall"
# to help block DoS attacks and UDP port flooding.
#
# Generate with:
# openvpn --genkey --secret ta.key
#
# The server and each client must have
# a copy of this key.
# The second parameter should be '0'
# on the server and '1' on the clients.
tls-crypt ta.key
;tls-auth ta.key 0 # This file is secret
# Select a cryptographic cipher.
# This config item must be copied to
# the client config file as well.
# Note that 2.4 client/server will automatically
# negotiate AES-256-GCM in TLS mode.
# See also the ncp-cipher option in the manpage
cipher AES-256-CBC
auth SHA512
tls-version-min 1.2
tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384:TLS-DHE-RSA-WITH-AES-128-GCM-SHA256:TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA:TLS-DHE-RSA-WITH-AES-128-CBC-SHA:TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA
# Enable compression on the VPN link and push the
# option to the client (2.4+ only, for earlier
# versions see below)
;compress lz4-v2
;push "compress lz4-v2"
# For compression compatible with older clients use comp-lzo
# If you enable it here, you must also
# enable it in the client config file.
;comp-lzo
# The maximum number of concurrently connected
# clients we want to allow.
;max-clients 100
# It's a good idea to reduce the OpenVPN
# daemon's privileges after initialization.
#
# You can uncomment this out on
# non-Windows systems.
user nobody
group nobody
# The persist options will try to avoid
# accessing certain resources on restart
# that may no longer be accessible because
# of the privilege downgrade.
persist-key
persist-tun
# Output a short status file showing
# current connections, truncated
# and rewritten every minute.
status openvpn-status.log
# By default, log messages will go to the syslog (or
# on Windows, if running as a service, they will go to
# the "\Program Files\OpenVPN\log" directory).
# Use log or log-append to override this default.
# "log" will truncate the log file on OpenVPN startup,
# while "log-append" will append to it. Use one
# or the other (but not both).
;log openvpn.log
;log-append openvpn.log
# Set the appropriate level of log
# file verbosity.
#
# 0 is silent, except for fatal errors
# 4 is reasonable for general usage
# 5 and 6 can help to debug connection problems
# 9 is extremely verbose
verb 3
# Silence repeating messages. At most 20
# sequential messages of the same message
# category will be output to the log.
;mute 20
# Notify the client that when the server restarts so it
# can automatically reconnect.
explicit-exit-notify 1[

3
states/systems/core/backup/init.sls
View file

@ -11,7 +11,7 @@
{{ name }}_key:
file.managed:
- name: /root/.ssh/{{ pillar['backup'][name]['key'] }}
- source: salt://secure/keys/backup/{{ pillar['backup'][name]['key'] }}
- source: salt://secure/keys/backups/{{ pillar['backup'][name]['key'] }}
- user: root
- group: root
- mode: 600
@ -59,7 +59,6 @@ backup_{{ name }}:
rsync.synchronized:
- name: {{ name }}:/mnt/butter/backups/configurations/{{ name }}/latest
- source: {{ pillar['backup'][name]['location'] }}/
- prepare: true
- delete: true
- force: true
{%- endif -%}