Commit Diff
Diff:
177e2ac30d11b85641abf065dc23621b8e7d43e0
71d1e25001b7351b471a19c15a0a1633938f7f4d
Commit:
71d1e25001b7351b471a19c15a0a1633938f7f4d
Tree:
e6a51b96a068828db3ac56c7fccc28adc26b803c
Author:
jrmu <jrmu@ircnow.org>
Committer:
jrmu <jrmu@ircnow.org>
Date:
Sat Jul 29 04:24:53 2023 UTC
Message:
Applied miniontoby's suggested patch
blob - 76b3e340f80128afa2f2c7e1e756a7c9912b2c4a
blob + d621897da2f830e65456a323ea14edc2e7d289c5
--- botnow.conf.example
+++ botnow.conf.example
@@ -59,7 +59,7 @@ mailfrom = support@example.com
#mailname = example
#Modules to load
-modules = BNC DNS Mail Shell SQLite Hash Help
+modules = BNC DNS Mail Shell VPN SQLite Hash Help
#Uncomment to require admin approval for new accounts
#approval = true
@@ -90,8 +90,8 @@ die = You did not configure botnow.conf!
#Network Interface Config File
#hostnameif = /etc/hostname.vio0
+#Iked Config File
+#ikedconf = /etc/iked.conf
+
#Verbosity: NONE, ERRORS, WARNINGS, ALL
#verbose = ERRORS
-
-#New shell user login class
-#loginclass = freeshell
blob - 943e230ff1fb0936e28411c1a55dc581a7ebfbba
blob + 3f18f6182f9b72994b517b93e6f824e2e84c1f42
--- install
+++ install
@@ -11,6 +11,7 @@ HTTPDCONF="/etc/httpd.conf"
ACMECONF="/etc/acme-client.conf"
MAILDIR="/etc/mail/"
HOSTNAMEIF="/etc/hostname.vio0"
+IKEDCONF="/etc/iked.conf"
pkg_add figlet-2.2.5 p5-DBI p5-DBD-SQLite sqlite3 p5-Class-DBI-SQLite
cc -o blowfish.o blowfish.c
@@ -38,6 +39,8 @@ chown -R _nsd:daemon ${ZONES}
chmod ug+rwx ${ZONES}
chmod ug+rw ${ZONES}/*
chmod -R g+rw ${HTTPDCONF} ${ACMECONF} ${MAILDIR}
+chgrp wheel ${IKEDCONF}
+chmod g+r ${IKEDCONF}
echo "permit nopass ${USERNAME}" >> /etc/doas.conf
usermod -G _dovecot botnow
chmod g+rw ${HOSTNAMEIF}
blob - d12207032804071768ac0dd95ce20073505207f9
blob + d1840b9feb2cce9213dd5c3b4f3b9433c5b97a7b
--- table.sql
+++ table.sql
@@ -37,6 +37,19 @@ CREATE TABLE mail (
datetime VARCHAR(25) AS (datetime(localtime, 'unixepoch')),
captcha INTEGER
);
+CREATE TABLE vpn (
+ id INTEGER PRIMARY KEY,
+ hashid VARCHAR(100),
+ ircid INTEGER,
+ wwwid INTEGER,
+ smtpid INTEGER,
+ username VARCHAR(32),
+ email VARCHAR(100),
+ password VARCHAR(100),
+ localtime INTEGER DEFAULT (unixepoch()),
+ datetime VARCHAR(25) AS (datetime(localtime, 'unixepoch')),
+ captcha INTEGER
+);
CREATE TABLE www (
id INTEGER PRIMARY KEY,
hashid VARCHAR(100),
IRCNow