From 1034f5ac1d90055231afb8eaca59542d385edcc1 Mon Sep 17 00:00:00 2001 From: Pinga <121483313+getpinga@users.noreply.github.com> Date: Sat, 27 Jul 2024 19:38:44 +0300 Subject: [PATCH] Fixed #130, #128, #126 --- database/registry.mariadb.sql | 4 ++-- database/registry.postgres.sql | 4 ++-- docs/install.md | 4 ++-- tests/clean-test-details.php | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/database/registry.mariadb.sql b/database/registry.mariadb.sql index bcb0ea1..c2c9d6d 100644 --- a/database/registry.mariadb.sql +++ b/database/registry.mariadb.sql @@ -838,8 +838,8 @@ INSERT INTO `registry`.`domain_price` VALUES('6','2','transfer','0.00','5.00','1 INSERT INTO `registry`.`domain_restore_price` VALUES('1','1','50.00'); INSERT INTO `registry`.`domain_restore_price` VALUES('2','2','50.00'); -INSERT INTO `registry`.`registrar` (`name`,`clid`,`pw`,`prefix`,`email`,`whois_server`,`rdap_server`,`url`,`abuse_email`,`abuse_phone`,`accountBalance`,`creditLimit`,`creditThreshold`,`thresholdType`,`crdate`,`lastupdate`) VALUES('LeoNet LLC','leonet','$argon2id$v=19$m=131072,t=6,p=4$M0ViOHhzTWFtQW5YSGZ2MA$g2pKb+PEYtfs4QwLmf2iUtPM4+7evuqYQFp6yqGZmQg','LN','info@leonet.ua','whois.leonet.ua','rdap.leonet.ua','https://www.leonet.ua','abuse@leonet.ua','+380.325050','100000.00','100000.00','500.00','fixed',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP); -INSERT INTO `registry`.`registrar` (`name`,`clid`,`pw`,`prefix`,`email`,`whois_server`,`rdap_server`,`url`,`abuse_email`,`abuse_phone`,`accountBalance`,`creditLimit`,`creditThreshold`,`thresholdType`,`crdate`,`lastupdate`) VALUES('Nord Registrar AB','nordregistrar','$argon2id$v=19$m=131072,t=6,p=4$MU9Eei5UMjA0M2cxYjd3bg$2yBHTWVVY4xQlMGhnhol9MRbVyVQg8qkcZ6cpdeID1U','NR','info@nordregistrar.com','whois.nordregistrar.com','rdap.nordregistrar.com','https://www.nordregistrar.com','abuse@nordregistrar.com','+46.80203','100000.00','100000.00','500.00','fixed',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP); +INSERT INTO `registry`.`registrar` (`name`,`clid`,`pw`,`prefix`,`email`,`whois_server`,`rdap_server`,`url`,`abuse_email`,`abuse_phone`,`accountBalance`,`creditLimit`,`creditThreshold`,`thresholdType`,`companyNumber`,`crdate`,`lastupdate`) VALUES('LeoNet LLC','leonet','$argon2id$v=19$m=131072,t=6,p=4$M0ViOHhzTWFtQW5YSGZ2MA$g2pKb+PEYtfs4QwLmf2iUtPM4+7evuqYQFp6yqGZmQg','LN','info@leonet.ua','whois.leonet.ua','rdap.leonet.ua','https://www.leonet.ua','abuse@leonet.ua','+380.325050','100000.00','100000.00','500.00','fixed','100000000',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP); +INSERT INTO `registry`.`registrar` (`name`,`clid`,`pw`,`prefix`,`email`,`whois_server`,`rdap_server`,`url`,`abuse_email`,`abuse_phone`,`accountBalance`,`creditLimit`,`creditThreshold`,`thresholdType`,`companyNumber`,`crdate`,`lastupdate`) VALUES('Nord Registrar AB','nordregistrar','$argon2id$v=19$m=131072,t=6,p=4$MU9Eei5UMjA0M2cxYjd3bg$2yBHTWVVY4xQlMGhnhol9MRbVyVQg8qkcZ6cpdeID1U','NR','info@nordregistrar.com','whois.nordregistrar.com','rdap.nordregistrar.com','https://www.nordregistrar.com','abuse@nordregistrar.com','+46.80203','100000.00','100000.00','500.00','fixed','200000000',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP); INSERT INTO `registry`.`registrar_whitelist` (`registrar_id`, `addr`) VALUES (1, '1.2.3.4'); diff --git a/database/registry.postgres.sql b/database/registry.postgres.sql index 62054e4..55391a1 100644 --- a/database/registry.postgres.sql +++ b/database/registry.postgres.sql @@ -762,8 +762,8 @@ INSERT INTO domain_restore_price VALUES (E'1',E'1',E'50.00'); INSERT INTO domain_restore_price VALUES (E'2',E'2',E'50.00'); SELECT setval('domain_restore_price_id_seq', COALESCE((SELECT MAX(id) FROM domain_restore_price), 0) + 1); -INSERT INTO registrar ("name", "clid", "pw", "prefix", "email", "whois_server", "rdap_server", "url", "abuse_email", "abuse_phone", "accountbalance", "creditlimit", "creditthreshold", "thresholdtype", "crdate", "lastupdate") VALUES (E'LeoNet LLC',E'leonet',E'$argon2id$v=19$m=131072,t=6,p=4$M0ViOHhzTWFtQW5YSGZ2MA$g2pKb+PEYtfs4QwLmf2iUtPM4+7evuqYQFp6yqGZmQg',E'LN',E'info@leonet.ua',E'whois.leonet.ua',E'rdap.leonet.ua',E'https://www.leonet.ua',E'abuse@leonet.ua',E'+380.325050',E'100000.00',E'100000.00',E'500.00',E'fixed',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP); -INSERT INTO registrar ("name", "clid", "pw", "prefix", "email", "whois_server", "rdap_server", "url", "abuse_email", "abuse_phone", "accountbalance", "creditlimit", "creditthreshold", "thresholdtype", "crdate", "lastupdate") VALUES (E'Nord Registrar AB',E'nordregistrar',E'$argon2id$v=19$m=131072,t=6,p=4$MU9Eei5UMjA0M2cxYjd3bg$2yBHTWVVY4xQlMGhnhol9MRbVyVQg8qkcZ6cpdeID1U',E'NR',E'info@nordregistrar.com',E'whois.nordregistrar.com',E'rdap.nordregistrar.com',E'https://www.nordregistrar.com',E'abuse@nordregistrar.com',E'+46.80203',E'100000.00',E'100000.00',E'500.00',E'fixed',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP); +INSERT INTO registrar ("name", "clid", "pw", "prefix", "email", "whois_server", "rdap_server", "url", "abuse_email", "abuse_phone", "accountbalance", "creditlimit", "creditthreshold", "thresholdtype", "companyNumber", "crdate", "lastupdate") VALUES (E'LeoNet LLC',E'leonet',E'$argon2id$v=19$m=131072,t=6,p=4$M0ViOHhzTWFtQW5YSGZ2MA$g2pKb+PEYtfs4QwLmf2iUtPM4+7evuqYQFp6yqGZmQg',E'LN',E'info@leonet.ua',E'whois.leonet.ua',E'rdap.leonet.ua',E'https://www.leonet.ua',E'abuse@leonet.ua',E'+380.325050',E'100000.00',E'100000.00',E'500.00',E'fixed',E'100000000',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP); +INSERT INTO registrar ("name", "clid", "pw", "prefix", "email", "whois_server", "rdap_server", "url", "abuse_email", "abuse_phone", "accountbalance", "creditlimit", "creditthreshold", "thresholdtype", "companyNumber", "crdate", "lastupdate") VALUES (E'Nord Registrar AB',E'nordregistrar',E'$argon2id$v=19$m=131072,t=6,p=4$MU9Eei5UMjA0M2cxYjd3bg$2yBHTWVVY4xQlMGhnhol9MRbVyVQg8qkcZ6cpdeID1U',E'NR',E'info@nordregistrar.com',E'whois.nordregistrar.com',E'rdap.nordregistrar.com',E'https://www.nordregistrar.com',E'abuse@nordregistrar.com',E'+46.80203',E'100000.00',E'100000.00',E'500.00',E'fixed',E'200000000',CURRENT_TIMESTAMP,CURRENT_TIMESTAMP); SELECT setval('registrar_id_seq', COALESCE((SELECT MAX(id) FROM registrar), 0) + 1); INSERT INTO registrar_whitelist ("registrar_id", "addr") VALUES diff --git a/docs/install.md b/docs/install.md index 6f863f1..c342c14 100644 --- a/docs/install.md +++ b/docs/install.md @@ -4,11 +4,11 @@ Welcome to the Installation Guide for Namingo, the comprehensive domain registry As you follow along with this document, it's important to also review the [Configuration Guide](configuration.md). This guide will provide you with detailed information on how to configure various components of Namingo, ensuring that your system is tailored to meet your specific requirements. Familiarizing yourself with these configuration steps during installation will help in setting up Namingo for optimal performance and functionality. -Once you have completed the installation process, we encourage you to proceed to the [Initial Operation Guide](docs/iog.md) for detailed instructions on how to configure your registry, add registrars, and other essential operational steps. +Once you have completed the installation process, we encourage you to proceed to the [Initial Operation Guide](iog.md) for detailed instructions on how to configure your registry, add registrars, and other essential operational steps. **To install Namingo on Ubuntu 24.04 LTS with PHP 8.3 and MariaDB 10.11.8, use the automated installer currently provided.** -***To upgrade from v1.0.0-RC4, please see our [upgrade guide](docs/upgrade.md)*** +***To upgrade from v1.0.0-RC4, please see our [upgrade guide](upgrade.md)*** ## 1. Install the required packages: diff --git a/tests/clean-test-details.php b/tests/clean-test-details.php index 73fbcd8..86f2374 100644 --- a/tests/clean-test-details.php +++ b/tests/clean-test-details.php @@ -48,7 +48,6 @@ try { $dbh->prepare("DELETE FROM domain_restore_price")->execute(); $dbh->prepare("DELETE FROM domain_price")->execute(); - $dbh->prepare("DELETE FROM domain_price")->execute(); $dbh->prepare("DELETE FROM domain_tld")->execute(); $dbh->commit();