diff --git a/states/roles/maintain/rtorrent/init.sls b/states/roles/maintain/rtorrent/init.sls index 578ad7e..9d58b84 100644 --- a/states/roles/maintain/rtorrent/init.sls +++ b/states/roles/maintain/rtorrent/init.sls @@ -78,9 +78,9 @@ rtorrent-php-fpm: - group: root - mode: 644 - mkdirs: true -rtorrent_service: - service.running: - - name: rtorrent - - enable: true - - watch: - - file: /root/.rtorrent.rc \ No newline at end of file +#rtorrent_service: +# service.running: +# - name: rtorrent +# - enable: false +# - watch: +# - file: /root/.rtorrent.rc \ No newline at end of file diff --git a/states/roles/maintain/windscribe/init.sls b/states/roles/maintain/windscribe/init.sls index 48af914..bf5dee2 100644 --- a/states/roles/maintain/windscribe/init.sls +++ b/states/roles/maintain/windscribe/init.sls @@ -1,6 +1,10 @@ -windscribe-vpn-pkg: - pkg.installed: - - name: openvpn +windscribe: + service.running: + - enable: true + +#windscribe-vpn-pkg: +# pkg.installed: +# - name: openvpn #/etc/firewalld/direct.xml: # file.managed: @@ -9,26 +13,26 @@ windscribe-vpn-pkg: # - group: root # - mode: 644 -/etc/openvpn/client/windscribe-denmark.conf: - file.managed: - - source: salt://roles/maintain/windscribe/windscribe-denmark.conf - - user: root - - group: root - - mode: 644 +#/etc/openvpn/client/windscribe-denmark.conf: +# file.managed: +# - source: salt://roles/maintain/windscribe/windscribe-denmark.conf +# - user: root +# - group: root +# - mode: 644 -/etc/openvpn/client/windscribe.login: - file.managed: - - source: salt://secure/files/windscribe.login - - user: root - - group: root - - mode: 600 +#/etc/openvpn/client/windscribe.login: +# file.managed: +# - source: salt://secure/files/windscribe.login +# - user: root +# - group: root +# - mode: 600 -openvpn-client@windscribe-denmark: - service.running: - - enable: true - - watch: - - file: /etc/openvpn/client/windscribe-denmark.conf - - file: /etc/openvpn/client/windscribe.login +#openvpn-client@windscribe-denmark: +# service.running: +# - enable: true +# - watch: +# - file: /etc/openvpn/client/windscribe-denmark.conf +# - file: /etc/openvpn/client/windscribe.login #windscribe-firewall: # service.running: