diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 87dd495..4f56241 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -6,6 +6,7 @@ This document seeks to say "cheers", "many thanks" & "love your work" to the peo - [@cybercoder](https://github.com/cybercoder) - [@lsthompson](https://github.com/lsthompson) +- [@The-Network-Crew](https://github.com/The-Network-Crew) - [@nodespacehosting](https://github.com/nodespacehosting) - [@WaldperlachFabi](https://github.com/WaldperlachFabi) - [@is7Qin](https://github.com/is7Qin) diff --git a/README.md b/README.md index 0df6f1b..05e20aa 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you have proven and public git-logged experience, or similar, please say g'day. Please note: We are only looking for high-quality applicants with spare time. - As it stands, we won't have much spare dev time for PVEWHMCS in early 2025. + As it stands, we won't have much spare dev time for PVEWHMCS in 2025. - Configure VM/CT plans with custom CPU/RAM/VLAN/On-boot/Bandwidth/etc - Automatically Provision VMs & CTs in **Proxmox VE** from **WHMCS** easily @@ -126,7 +126,7 @@ noVNC has been overhauled. It isn't guaranteed, nor the project at all. :-) ### IPv4: Pool required for assignment -Please make sure you create an IP Pool with sufficient scope/size to be able to deploy addresses within it to your guest VMs and CTs. Else it won't be able to create a Service for you. +Please make sure you create an IPv4 Pool with sufficient scope/size to be able to deploy addresses within it to your guest VMs and CTs. Else it won't be able to create a Service for you. **Private IPs for PVE Hosts:** Note that VNC may be problematic without work due to the strict requirements introduced in Proxmox v8.0 (strict same-site attribute). diff --git a/modules/addons/pvewhmcs/db.sql b/modules/addons/pvewhmcs/db.sql index 2a10446..c31b366 100644 --- a/modules/addons/pvewhmcs/db.sql +++ b/modules/addons/pvewhmcs/db.sql @@ -21,6 +21,45 @@ CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_ip_pools` ( `gateway` varchar(100) DEFAULT NULL, PRIMARY KEY (`id`) ); +CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_iso` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `title` varchar(255) NOT NULL, + `storage` varchar(20) NOT NULL DEFAULT 'local', + `iso-name` varchar(255) NOT NULL, + `nodes` int(11) DEFAULT '0', + `created` datetime NOT NULL, + PRIMARY KEY (`id`) +); +CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_logs` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `auth_id` int(11) NOT NULL DEFAULT '0', + `user_id` int(11) NOT NULL DEFAULT '0', + `service` int(11) NOT NULL DEFAULT '0', + `timestamp` datetime NOT NULL, + `node_id` int(11) NOT NULL DEFAULT '0', + `target_id` int(11) NOT NULL DEFAULT '0', + `level` varchar(10) NOT NULL, + `type` text NOT NULL, + `action` text NOT NULL, + `request` text NOT NULL, + `response` text NOT NULL, + `raw` text NOT NULL, + PRIMARY KEY (`id`) +); +CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_nodes` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `pve_id` int(11) NOT NULL, + `pve_name` varchar(255) NOT NULL, + `title` varchar(255) NOT NULL, + `ip` varchar(100) NOT NULL, + `capacity` int(5) NOT NULL DEFAULT '20', + `health` text DEFAULT NULL, + `resources` text DEFAULT NULL, + `supports` varchar(255) NOT NULL DEFAULT 'vm,ct', + `templates` varchar(1000) NOT NULL DEFAULT '', + `created` datetime NOT NULL, + PRIMARY KEY (`id`) +); CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_plans` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `title` varchar(255) CHARACTER SET utf8 NOT NULL, @@ -51,11 +90,31 @@ CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_plans` ( `vlanid` varchar(10) DEFAULT NULL, `ipv6` varchar(10) DEFAULT 'auto', `balloon` varchar(10) DEFAULT '0', + `ssh-keys` varchar(100) DEFAULT '', + PRIMARY KEY (`id`) +); +CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_ssh_keys` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `title` varchar(255) NOT NULL DEFAULT '', + `ssh-key` text NOT NULL, + `created` datetime NOT NULL, + PRIMARY KEY (`id`) +); +CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_templates` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `tpl_id` int(11) DEFAULT NULL, + `title` varchar(255) NOT NULL, + `guest` varchar(8) NOT NULL DEFAULT 'vm', + `ostype` varchar(8) DEFAULT NULL, + `storage` varchar(20) DEFAULT 'local', + `template` varchar(255) DEFAULT NULL, + `nodes` int(11) DEFAULT '0', PRIMARY KEY (`id`) ); CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_vms` ( `id` int(10) unsigned NOT NULL, `vmid` int(10) unsigned DEFAULT NULL, + `node_id` int(10) unsigned DEFAULT NULL, `user_id` int(10) unsigned NOT NULL, `vtype` varchar(255) NOT NULL, `ipaddress` varchar(255) NOT NULL, @@ -64,4 +123,4 @@ CREATE TABLE IF NOT EXISTS `mod_pvewhmcs_vms` ( `created` datetime DEFAULT NULL, `v6prefix` varchar(128) DEFAULT NULL, PRIMARY KEY (`id`) -); +); \ No newline at end of file