2 commits

Author	SHA1	Message	Date
Beth Parker	a4bbe66416	Added VPN server config, fixed deluge config and backups	2017-09-05 22:33:09 -05:00
Beth Parker	408866fd12	Updated merge script, moved certs and keys symlinks and references to secure, and added ca and vpnserver states	2017-08-25 10:35:25 -05:00