Move to template-in-playbook scheme
This commit is contained in:
		@@ -1,3 +1,7 @@
 | 
				
			|||||||
# 3proxy
 | 
					# 3proxy
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Ansible role for configuring 3proxy
 | 
					Ansible role for configuring 3proxy
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Variables
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Set `3proxy_config_template` to template file you want to deploy as unbound configuration
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +0,0 @@
 | 
				
			|||||||
---
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
cfg_3proxy_defaults:
 | 
					 | 
				
			||||||
  user: service3proxy
 | 
					 | 
				
			||||||
  group: service3proxy
 | 
					 | 
				
			||||||
  chroot: /var/empty
 | 
					 | 
				
			||||||
@@ -5,15 +5,3 @@
 | 
				
			|||||||
    name: 3proxy
 | 
					    name: 3proxy
 | 
				
			||||||
    # Change to reloaded, when systemd unit override is done
 | 
					    # Change to reloaded, when systemd unit override is done
 | 
				
			||||||
    state: restarted
 | 
					    state: restarted
 | 
				
			||||||
 | 
					 | 
				
			||||||
- name: 3proxy | Stop service
 | 
					 | 
				
			||||||
  systemd:
 | 
					 | 
				
			||||||
    name: 3proxy
 | 
					 | 
				
			||||||
    state: stopped
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
- name: 3proxy | Start service
 | 
					 | 
				
			||||||
  systemd:
 | 
					 | 
				
			||||||
    name: 3proxy
 | 
					 | 
				
			||||||
    daemon_reload: yes
 | 
					 | 
				
			||||||
    state: started
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,52 +1,21 @@
 | 
				
			|||||||
#- block:
 | 
					---
 | 
				
			||||||
#  - name: 3proxy | Install from aur
 | 
					 | 
				
			||||||
#    aur:
 | 
					 | 
				
			||||||
#      name: 3proxy
 | 
					 | 
				
			||||||
#      use: makepkg
 | 
					 | 
				
			||||||
#      skip_installed: yes
 | 
					 | 
				
			||||||
#  become: no
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#Creating group threeproxy with gid 973.
 | 
					- name: 3proxy | Install from aur
 | 
				
			||||||
#Creating user threeproxy (3proxy user) with uid 973 and gid 973.
 | 
					   aur:
 | 
				
			||||||
 | 
					     name: 3proxy
 | 
				
			||||||
- name: 3proxy | Create group
 | 
					     use: makepkg
 | 
				
			||||||
  group:
 | 
					     skip_installed: yes
 | 
				
			||||||
    name: "{{ cfg_3proxy.group | default(cfg_3proxy_defaults.group) }}"
 | 
					  become: no
 | 
				
			||||||
    system: yes
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
- name: 3proxy | Create user
 | 
					 | 
				
			||||||
  user:
 | 
					 | 
				
			||||||
    name: "{{ cfg_3proxy.user | default(cfg_3proxy_defaults.user) }}"
 | 
					 | 
				
			||||||
    group: "{{ cfg_3proxy.group | default(cfg_3proxy_defaults.group) }}"
 | 
					 | 
				
			||||||
    shell: /usr/bin/nologin
 | 
					 | 
				
			||||||
    system: yes
 | 
					 | 
				
			||||||
    create_home: no
 | 
					 | 
				
			||||||
  register: cfg_3proxy_user_info
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#3proxy | Deploy configuration file...
 | 
					 | 
				
			||||||
#  nyarlathotep.zeym.org failed | msg: Destination directory /etc/3proxy does not exist
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
- name: 3proxy | Deploy configuration file
 | 
					- name: 3proxy | Deploy configuration file
 | 
				
			||||||
  template:
 | 
					  template:
 | 
				
			||||||
    src: 3proxy.cfg.j2
 | 
					    src: 3proxy.cfg.j2
 | 
				
			||||||
    dest: /etc/3proxy/3proxy.cfg
 | 
					    dest: /etc/3proxy/3proxy.cfg
 | 
				
			||||||
    mode: 0600
 | 
					    mode: 0600
 | 
				
			||||||
    owner: "{{ cfg_3proxy.user | default(cfg_3proxy_defaults.user) }}"
 | 
					    owner: threeproxy
 | 
				
			||||||
    group: "{{ cfg_3proxy.group | default(cfg_3proxy_defaults.group) }}"
 | 
					    group: threeproxy
 | 
				
			||||||
  notify: 3proxy | Reload configuration
 | 
					  notify: 3proxy | Reload configuration
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#### some hardening
 | 
					 | 
				
			||||||
#- name: 3proxy | Deploy systemd service override
 | 
					 | 
				
			||||||
#  template:
 | 
					 | 
				
			||||||
#   src: 3proxy.service.j2
 | 
					 | 
				
			||||||
#   dest: /etc/systemd/system/...??? or /var/lib
 | 
					 | 
				
			||||||
#   mode: 0600
 | 
					 | 
				
			||||||
#   owner: root
 | 
					 | 
				
			||||||
#   group: root
 | 
					 | 
				
			||||||
#  notify:
 | 
					 | 
				
			||||||
#    - 3proxy | Stop service
 | 
					 | 
				
			||||||
#    - 3proxy | Start service
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
- name: 3proxy | Enable and start
 | 
					- name: 3proxy | Enable and start
 | 
				
			||||||
  systemd:
 | 
					  systemd:
 | 
				
			||||||
    name: 3proxy
 | 
					    name: 3proxy
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,24 +0,0 @@
 | 
				
			|||||||
# {{ ansible_managed }}
 | 
					 | 
				
			||||||
nserver 127.0.0.1
 | 
					 | 
				
			||||||
nscache 1048576
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
external 0.0.0.0
 | 
					 | 
				
			||||||
internal 0.0.0.0
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
auth strong
 | 
					 | 
				
			||||||
maxconn 512
 | 
					 | 
				
			||||||
socks -p{{ cfg_3proxy.socks_port }}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
{% for item in cfg_3proxy.users %}
 | 
					 | 
				
			||||||
users "{{ item }}"
 | 
					 | 
				
			||||||
{% endfor %}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
{% for item in cfg_3proxy.include %}
 | 
					 | 
				
			||||||
include "{{ item }}"
 | 
					 | 
				
			||||||
{% endfor %}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
chroot {{ cfg_3proxy.chroot | default(cfg_3proxy_defaults.chroot) }}
 | 
					 | 
				
			||||||
setgid {{ cfg_3proxy_user_info.group | default(cfg_3proxy_defaults.group) }}
 | 
					 | 
				
			||||||
setuid {{ cfg_3proxy_user_info.uid | default(cfg_3proxy_defaults.user) }}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
end
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user