Compare commits

..

6 Commits

Author SHA1 Message Date
Alex Tavarez
d149361e60 set up or initialized Python project 2025-12-21 16:58:39 -05:00
Alex Tavarez
1851b0bb04 added Python lock file to version control exclusion rules 2025-12-21 16:57:41 -05:00
Alex Tavarez
88aac6b598 created environment variables file 2025-12-21 16:56:35 -05:00
Alex Tavarez
ed06773cac changed a version control exclude rule due to change in Python environment dir change 2025-12-21 16:55:59 -05:00
Alex Tavarez
0dc3edc0bc added next few tasks 2025-12-21 16:54:39 -05:00
Alex Tavarez
ea7d9f7caf changed some fields/keys/attributes and changed references to reflect those changes 2025-12-21 16:53:52 -05:00
9 changed files with 72 additions and 26 deletions

28
.env Normal file
View File

@@ -0,0 +1,28 @@
SKATO_ANSIBLE_ROOT=$(dirname "$0")
SKATO_ANSIBLE_ROOT=$(dirname "$SKATO_ANSIBLE_ROOT")
SKATO_BOOTSTRAP_ROLE="${SKATO_ANSIBLE_ROOT}/roles/bootstrap"
SKANSIBLE_SECRETS="${SKATO_ANSIBLE_ROOT}/.secrets"
# Relative directory paths for role templates/files
SKANSIBLE_ARIA="aria2"
SKANSIBLE_PROFTPD="proftpd"
SKANSIBLE_PROFTPD_CONFS="${SKANSIBLE_PROFTPD}/conf.d"
# @NOTE below 4 filepaths have filenames that must correspond to
# the filenames in role ProFTPd templates'/files' Display settings
SKANSIBLE_PROFTPD_CONFS_WELCOME="${SKANSIBLE_PROFTPD}/conf.d/WELCOME.txt"
SKANSIBLE_PROFTPD_CONFS_BANNER="${SKANSIBLE_PROFTPD}/conf.d/BANNER.txt"
SKANSIBLE_PROFTPD_CONFS_SUCCESS="${SKANSIBLE_PROFTPD}/conf.d/SUCCESS.txt"
SKANSIBLE_PROFTPD_CONFS_EXIT="${SKANSIBLE_PROFTPD}/conf.d/BYE.txt"
SKANSIBLE_SSHD_CONFS="sshd_config.d"
SKANSIBLE_SYSTEMD="systemd"
SKANSIBLE_SYSTEMD_USER_UNITS="${SKANSIBLE_SYSTEMD}/user"
SKANSIBLE_FAIL2BAN="fail2ban"
SKANSIBLE_FAIL2BAN_JAILS="${SKANSIBLE_FAIL2BAN}/jail.d"
SKANSIBLE_FAIL2BAN_FILTERS="${SKANSIBLE_FAIL2BAN}/filter.d"
SKANSIBLE_GITCONFIG_CONFS="gitconfig.d"
# @NOTE files in here must have extension "key" with IDs in
# "gpg_keys" inventory variable list as basenames.
SKANSIBLE_GPG="gnupg"
# @NOTE files in path below must have extensions "key" (private),
# "crt" (signed), or "pem" (public) with inventory host FQDN as basename
SKANSIBLE_SSL="ca-certificates"

5
.gitignore vendored
View File

@@ -1,4 +1,4 @@
.env/ .venv/
*.bak *.bak
hosts.yml hosts.yml
.secrets/* .secrets/*
@@ -16,4 +16,5 @@ collections/
motd motd
banner banner
.galaxy_cache/ .galaxy_cache/
galaxy_token galaxy_token
uv.lock

1
.python-version Normal file
View File

@@ -0,0 +1 @@
3.13

12
pyproject.toml Normal file
View File

@@ -0,0 +1,12 @@
[project]
name = "skansible"
version = "0.1.0"
description = "Add your description here"
readme = "README.md"
requires-python = ">=3.13"
dependencies = [
"ansible>=13.1.0",
"ansible-lint>=25.12.1",
"ansible-navigator>=25.12.0",
"click>=8.3.1",
]

View File

@@ -14,7 +14,7 @@
group: "{{ item[0]['group'] | default(item[0]['username']) }}" group: "{{ item[0]['group'] | default(item[0]['username']) }}"
path: "{{ item[0]['home'] | default('/home/' ~ item[0]['username']) }}/{{ item[1]['username'] }}" path: "{{ item[0]['home'] | default('/home/' ~ item[0]['username']) }}/{{ item[1]['username'] }}"
state: directory state: directory
loop: "{{ hostvars[inventory_hostname]['users'].values() | product(config['proftpd']['vusers'].values()) }}" loop: "{{ hostvars[inventory_hostname]['users'].values() | product(config['proftpd']['users'].values()) }}"
- name: Create ProFTPd FTP public directory for anonymous logins - name: Create ProFTPd FTP public directory for anonymous logins
when: "'ftps' in item.value['services']" when: "'ftps' in item.value['services']"
ansible.builtin.file: ansible.builtin.file:
@@ -65,7 +65,7 @@
owner: root owner: root
path: "{{ item.value }}" path: "{{ item.value }}"
state: touch state: touch
loop: "{{ lookup('ansible.builtin.dict', config['proftpd']['auth_filepaths']) }}" loop: "{{ lookup('ansible.builtin.dict', config['proftpd']['auth_paths']) }}"
- name: Create the virtual users - name: Create the virtual users
when: "not 'caddy' in item.value['services'] and not 'httpd' in item.value['services'] and not 'www-data' in item.value['services'] and not 'http' in item.value['services'] and not 'https' in item.value['services']" when: "not 'caddy' in item.value['services'] and not 'httpd' in item.value['services'] and not 'www-data' in item.value['services'] and not 'http' in item.value['services'] and not 'https' in item.value['services']"
ansible.builtin.command: ansible.builtin.command:
@@ -73,14 +73,14 @@
- ftpasswd - ftpasswd
- --passwd - --passwd
- "--name={{ item.value['username'] }}" - "--name={{ item.value['username'] }}"
- "--uid=$(id -u {{ item.value['id_of'] }})" - "--uid=$(id -u {{ item.value['id'] }})"
- "--gid=$(id -g {{ item.value['gid_of'] }})" - "--gid=$(id -g {{ item.value['gid'] }})"
- "--home={{ hostvars[inventory_hostname]['users']['ftp']['home'] | default('/srv/ftp') }}/{{ item.value['username'] }}" - "--home={{ hostvars[inventory_hostname]['users']['ftp']['home'] | default('/srv/ftp') }}/{{ item.value['username'] }}"
- --shell=/sbin/nologin - --shell=/sbin/nologin
- --file={{ config['proftpd']['auth_filepaths']['users_path'] }} - --file={{ config['proftpd']['auth_paths']['users'] }}
- --stdin - --stdin
stdin: "{{ item.value['password'] }}" stdin: "{{ item.value['password'] }}"
loop: "{{ lookup('ansible.builtin.dict', config['proftpd']['vusers']) }}" loop: "{{ lookup('ansible.builtin.dict', config['proftpd']['users']) }}"
- name: Create the virtual groups of virtual users - name: Create the virtual groups of virtual users
when: "not 'caddy' in item.value['services'] and not 'httpd' in item.value['services'] and not 'www-data' in item.value['services'] and not 'http' in item.value['services'] and not 'https' in item.value['services']" when: "not 'caddy' in item.value['services'] and not 'httpd' in item.value['services'] and not 'www-data' in item.value['services'] and not 'http' in item.value['services'] and not 'https' in item.value['services']"
ansible.builtin.command: ansible.builtin.command:
@@ -88,10 +88,10 @@
- ftpasswd - ftpasswd
- --group - --group
- "--name={{ item.value['username'] }}" - "--name={{ item.value['username'] }}"
- "--gid=$(id -g {{ item.value['gid_of'] }})" - "--gid=$(id -g {{ item.value['gid'] }})"
- "--member={{ item.value['username'] }}" - "--member={{ item.value['username'] }}"
- --file={{ config['proftpd']['auth_filepaths']['groups_path'] }} - --file={{ config['proftpd']['auth_paths']['groups'] }}
loop: "{{ lookup('ansible.builtin.dict', config['proftpd']['vusers']) }}" loop: "{{ lookup('ansible.builtin.dict', config['proftpd']['users']) }}"
# @TODO create tasks in block integrating LDAP users to ProFTPd # @TODO create tasks in block integrating LDAP users to ProFTPd
# - name: Integrate LDAP users into ProFTPd # - name: Integrate LDAP users into ProFTPd
- name: Create ProFTPd FTPS virtual host - name: Create ProFTPd FTPS virtual host
@@ -108,9 +108,9 @@
validate: proftpd --configtest validate: proftpd --configtest
vars: vars:
ftp_server_name: "{{ config['proftpd']['name'].uppercase() }}'s Archive'" ftp_server_name: "{{ config['proftpd']['name'].uppercase() }}'s Archive'"
allowed_users: "{{ ','.join(list(map(lambda u: u['username'], filter(lambda u: not 'http' in u['services'] and not 'https' in u['services'] and not 'httpd' in u['services'] and not 'caddy' in u['services'] and not 'www-data' in u['services'], config['proftpd']['vusers'].values())))) }}" allowed_users: "{{ ','.join(list(map(lambda u: u['username'], filter(lambda u: not 'http' in u['services'] and not 'https' in u['services'] and not 'httpd' in u['services'] and not 'caddy' in u['services'] and not 'www-data' in u['services'], config['proftpd']['users'].values())))) }}"
anon_root: "{{ map(lambda u: u['home'], filter(lambda u: 'ftps' in u['services'] or 'proftpd' in u['services'], hostvars[inventory_hostname]['users'].values())) | list | random }}/public" anon_root: "{{ map(lambda u: u['home'], filter(lambda u: 'ftps' in u['services'] or 'proftpd' in u['services'], hostvars[inventory_hostname]['users'].values())) | list | random }}/public"
anon_user: "{{ config['proftpd']['vusers']['smuggler']['username'] }}" anon_user: "{{ config['proftpd']['users']['smuggler']['username'] }}"
- name: Set ProFTPd jail in fail2ban - name: Set ProFTPd jail in fail2ban
block: block:
- name: Create fail2ban system configuration directory - name: Create fail2ban system configuration directory

View File

@@ -15,7 +15,7 @@ rpc-allow-origin-all=true
rpc-max-request-size=10M rpc-max-request-size=10M
rpc-listen-all=true rpc-listen-all=true
rpc-listen-port=6800 rpc-listen-port=6800
rpc-secret={{ config.aria.secret }} rpc-secret={{ config['aria']['api_key'] }}
# rpc-certificate= # rpc-certificate=
# rpc-private-key= # rpc-private-key=
# rpc-secure=true # rpc-secure=true

View File

@@ -20,8 +20,8 @@
# AuthOrder mod_auth_pam.c mod_auth_unix.c* # AuthOrder mod_auth_pam.c mod_auth_unix.c*
AuthOrder mod_auth_file.c AuthOrder mod_auth_file.c
AuthUserFile {{ config.proftpd.auth_filepaths.users_path }} AuthUserFile {{ config.proftpd.auth_paths.users }}
AuthGroupFile {{ config.proftpd.auth_filepaths.groups_path }} AuthGroupFile {{ config.proftpd.auth_paths.groups }}
AuthFileOptions SyntaxCheck AuthFileOptions SyntaxCheck
TLSEngine on TLSEngine on

View File

@@ -249,16 +249,16 @@ config:
editor: nvim editor: nvim
proftpd: proftpd:
name: "{{ hostvars[inventory_hostname].fqdn.split('.')[0] }}" name: "{{ hostvars[inventory_hostname].fqdn.split('.')[0] }}"
auth_filepaths: auth_paths:
users_path: /etc/proftpd/ftpd.passwd users: /etc/proftpd/ftpd.passwd
groups_path: /etc/proftpd/ftpd.group groups: /etc/proftpd/ftpd.group
msg: msg:
welcome: "Our head librarians Furcas and Marbas welcome you!" welcome: "Our head librarians Furcas and Marbas welcome you!"
vusers: users:
webmaster: webmaster:
username: webmaster username: webmaster
id_of: "{{ ['caddy', 'www-data'][0] }}" id: "{{ ['caddy', 'www-data'][0] }}"
gid_of: "{{ ['caddy', 'www-data'][0] }}" gid: "{{ ['caddy', 'www-data'][0] }}"
# @TODO create vaulted password for this ProFTPd virtual user # @TODO create vaulted password for this ProFTPd virtual user
password: !vault | password: !vault |
$ANSIBLE_VAULT;1.2;AES256;vps1-webmaster $ANSIBLE_VAULT;1.2;AES256;vps1-webmaster
@@ -270,8 +270,8 @@ config:
services: [http,https] services: [http,https]
smuggler: smuggler:
username: smuggler username: smuggler
id_of: "{{ hostvars[inventory_hostname].users.ftp.username }}" id: "{{ hostvars[inventory_hostname].users.ftp.username }}"
gid_of: "{{ hostvars[inventory_hostname].users.ftp.group | default(hostvars[inventory_hostname].users.ftp.username) }}" gid: "{{ hostvars[inventory_hostname].users.ftp.group | default(hostvars[inventory_hostname].users.ftp.username) }}"
# @TODO create vaulted password for this ProFTPd virtual user # @TODO create vaulted password for this ProFTPd virtual user
password: !vault | password: !vault |
$ANSIBLE_VAULT;1.2;AES256;vps1-smuggler $ANSIBLE_VAULT;1.2;AES256;vps1-smuggler
@@ -293,5 +293,5 @@ config:
phone_region: US phone_region: US
aria: aria:
checksum: ~ checksum: ~
secret: ~ api_key: ~

View File

@@ -3,7 +3,11 @@
#+language: en #+language: en
* PLANNED * PLANNED
** TODO [#A] Write documentation on the expected conventional names to be used in the inventory file ** DONE [#A] Write documentation on the expected conventional names to be used in the inventory file
** DONE [#A] Write documentation on the expected conventional paths to be used in the inventory file
** TODO [#A] Create Python Click library/package- based CLI
** TODO [#A] Soft-code relative paths for role files/templates in Ansible tasks/plays
** TODO [#A] Soft-code project root and paths to passwords/secrets files for Ansible tasks/plays
** TODO [#A] Rewrite dot notation usage of keys for accessing values in custom dictionary variables to bracket notation usage of keys across whole project ** TODO [#A] Rewrite dot notation usage of keys for accessing values in custom dictionary variables to bracket notation usage of keys across whole project
* IN PROGRESS * IN PROGRESS