diff --git a/facts/general/service.yml b/facts/general/service.yml index f422ffd..7f00c07 100644 --- a/facts/general/service.yml +++ b/facts/general/service.yml @@ -1,5 +1,5 @@ --- -# Define program names for service builtin. +# Definitions for service management. - name: General | Facts | Service | All set_fact: @@ -7,9 +7,10 @@ cups_pattern: cupsd cups_browse: cups-browsed cups_browse_pattern: cups-browsed + sshfs_leet_cmd: "sshfs {{ leet_ssh }}: /mnt/leet -o allow_other,_netdev" sshd: sshd sshd_pattern: sshd - sshfs_leet_cmd: "sshfs {{ leet_ssh }}: /mnt/leet -o allow_other,_netdev" + sshd_config: /etc/ssh/sshd_config - name: General | Facts | Service | Linux diff --git a/tasks/general/software/services.yml b/tasks/general/software/services.yml index 1933a7c..589d12a 100644 --- a/tasks/general/software/services.yml +++ b/tasks/general/software/services.yml @@ -1,6 +1,8 @@ --- # Enable and disable services. +## Fake SSHFS ## + - name: General | Software | Services | Create SSHFS rc.conf Entry (FreeBSD) blockinfile: path: /etc/rc.conf @@ -17,6 +19,9 @@ warn: false when: ansible_system == "FreeBSD" + +## CUPS ## + - name: General | Software | Services | Disable CUPS Daemon service: name: "{{ cups }}" @@ -31,12 +36,8 @@ state: stopped enabled: no -- name: General | Software | Services | Enable SSHD (Linux?) - service: - name: "{{ sshd }}" - pattern: "{{ sshd_pattern }}" - state: started - enabled: yes + +## SSHD ## #- name: General | Software | Services | Create SSHFS rc.conf Entry (FreeBSD) # lineinfile: @@ -46,4 +47,32 @@ # state: present # create: yes # backup: yes -# when: ansible_system == "FreeBSD" \ No newline at end of file +# when: ansible_system == "FreeBSD" + +- name: General | Software | Services | Create SSHFS rc.conf Entry (FreeBSD) + lineinfile: + path: "{{ sshd_config }}" + regexp: '{{ item.key }}' + line: '{{ item.value }} # MANAGED BY ANSIBLE' + state: present + create: no + backup: yes + loop: + - { "key": '^[\#]?PermitRootLogin', "value": 'PermitRootLogin no'} + - { "key": '^[\#]?AllowTcpForwarding', "value": 'AllowTcpForwarding no'} + - { "key": '^[\#]?ClientAliveCountMax', "value": 'ClientAliveCountMax 2'} + - { "key": '^[\#]?Compression', "value": 'Compression no'} + - { "key": '^[\#]?LogLevel', "value": 'LogLevel verbose'} + - { "key": '^[\#]?MaxAuthTries', "value": 'MaxAuthTries 3'} + - { "key": '^[\#]?MaxSessions', "value": 'MaxSessions 2'} + #- { "key": '^[\#]?Port', "value": 'Port '} + - { "key": '^[\#]?TCPKeepAlive', "value": 'TCPKeepAlive no'} + - { "key": '^[\#]?X11Forwarding', "value": 'X11Forwarding no'} + - { "key": '^[\#]?AllowAgentForwarding', "value": 'AllowAgentForwarding no'} + +- name: General | Software | Services | Enable SSHD (Linux?) + service: + name: "{{ sshd }}" + pattern: "{{ sshd_pattern }}" + state: started + enabled: yes \ No newline at end of file