Switched to windscribe-cli and temporarily disabled rtorrent autostart

This commit is contained in:
Beth Parker 2019-04-29 05:42:42 -05:00
parent 3831a9ba3e
commit 6eda38ede5
2 changed files with 31 additions and 27 deletions

View file

@ -78,9 +78,9 @@ rtorrent-php-fpm:
- group: root - group: root
- mode: 644 - mode: 644
- mkdirs: true - mkdirs: true
rtorrent_service: #rtorrent_service:
service.running: # service.running:
- name: rtorrent # - name: rtorrent
- enable: true # - enable: false
- watch: # - watch:
- file: /root/.rtorrent.rc # - file: /root/.rtorrent.rc

View file

@ -1,6 +1,10 @@
windscribe-vpn-pkg: windscribe:
pkg.installed: service.running:
- name: openvpn - enable: true
#windscribe-vpn-pkg:
# pkg.installed:
# - name: openvpn
#/etc/firewalld/direct.xml: #/etc/firewalld/direct.xml:
# file.managed: # file.managed:
@ -9,26 +13,26 @@ windscribe-vpn-pkg:
# - group: root # - group: root
# - mode: 644 # - mode: 644
/etc/openvpn/client/windscribe-denmark.conf: #/etc/openvpn/client/windscribe-denmark.conf:
file.managed: # file.managed:
- source: salt://roles/maintain/windscribe/windscribe-denmark.conf # - source: salt://roles/maintain/windscribe/windscribe-denmark.conf
- user: root # - user: root
- group: root # - group: root
- mode: 644 # - mode: 644
/etc/openvpn/client/windscribe.login: #/etc/openvpn/client/windscribe.login:
file.managed: # file.managed:
- source: salt://secure/files/windscribe.login # - source: salt://secure/files/windscribe.login
- user: root # - user: root
- group: root # - group: root
- mode: 600 # - mode: 600
openvpn-client@windscribe-denmark: #openvpn-client@windscribe-denmark:
service.running: # service.running:
- enable: true # - enable: true
- watch: # - watch:
- file: /etc/openvpn/client/windscribe-denmark.conf # - file: /etc/openvpn/client/windscribe-denmark.conf
- file: /etc/openvpn/client/windscribe.login # - file: /etc/openvpn/client/windscribe.login
#windscribe-firewall: #windscribe-firewall:
# service.running: # service.running: