From 381911304a667987658571ff0b26d9f0485c6349 Mon Sep 17 00:00:00 2001
From: Alex Tavarez <admin@sukaato.moe>
Date: Wed, 23 Jul 2025 15:31:46 -0400
Subject: [PATCH] Removed vars file inclusion to specify defaults for roles
 inclusion instead, added task to install ProFTPd ftpasswd utility and certbot
 Porkbun API plugin

---
 install@vps.yml | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/install@vps.yml b/install@vps.yml
index 9ac877a..d6ecf61 100644
--- a/install@vps.yml
+++ b/install@vps.yml
@@ -9,7 +9,8 @@
     # ansible_password: "{{ admin_auths[0].password }}"
     FAMILY: "{{ ansible_facts['os_family'] }}"
     CORE_PKGS: "core_pkgs@{{ ansible_facts['os_family'] }}.yml"
-    want_extra_pkgs: yes
+    want_extra_pkgs: no
+    porkbun_certbot_plugin: yes
 
   tasks:
     - name: Install core packages
@@ -32,24 +33,27 @@
       register: core_done
       tags: ['default', 'core']
     - name: Install additional packages
-      block:
-        # - name: Get core package list
-        #   include_vars:
-        #     file: "{{ roles_path }}/bootstrap/defaults/core_pkgs@{{ FAMILY }}.yml"
-        #     name: pkgs
-        #   register: pkgs_src
-        - name: Get custom package list
-          include_vars:
-            file: "{{ roles_path }}/bootstrap/defaults/custom_pkgs@{{ FAMILY }}.yml"
-            name: cpkgs
-          register: cpkgs_src
-        - name: Install additional packages
-          become: yes
-          become_method: sudo
-          include_role:
-            tasks_from: extra_installations.yml
-          vars:
-            extra_packages: ["{{ cpkgs.my_pkgs }}"]
-          register: extra_pkgs_done
+      become: yes
+      become_method: sudo
+      include_role:
+        tasks_from: extra_installations.yml
+        defaults_from: "custom_pkgs@{{ FAMILY }}.yml"
+      register: extra_pkgs_done
       when: want_extra_pkgs
-      tags: ['extra_pkgs']
\ No newline at end of file
+      tags: ['default', 'extra_pkgs']
+    - name: Install a Porkbun API plugin for Certbot
+      become: yes
+      become_method: sudo
+      pip:
+        name: 'git+https://github.com/infinityofspace/certbot_dns_porkbun.git'
+        state: present
+      when: porkbun_certbot_plugin
+      tags: ['default', 'with_porkbun_api']
+    - name: Get ftpasswd utility for ProFTPd
+      become: yes
+      become_method: sudo
+      get_url:
+        url: http://www.castaglia.org/proftpd/contrib/ftpasswd
+        dest: /usr/local/bin/ftpasswd
+        mode: "0755"
+      tags: ['default', 'with_ftp']
\ No newline at end of file