From fa363efaec0489995ba051faf631b20b391b8fe7 Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Sat, 6 May 2017 18:29:19 +0200 Subject: [PATCH] Bugfixes --- README.md | 5 +++++ etc/systemd/system/hosting-del.service | 2 +- etc/systemd/system/hosting.service | 2 +- var/www/setup.php | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 663fb38..bcb6e57 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ The configuration was designed for a standard Debian unstable installation. It's Software you will need to install and configure by copying (and editing according to your needs) the configuration files supplied: nginx, php7.0, php7.1, all php modules you want to support, sshd, vsftpd, phpmyadmin, adminer, mysql or mariadb, logrotate, tor, postfix, dovecot, saslauthd +To allow sasl authentication, add postfix to the sasl group: +``` +usermod -aG sasl postfix +``` + This setup has two postfix instances, one for receiving and sending mail to other .onion services and one for rewriting addresses to pass them on to a clearnet facing mail relay. You may or may not want to create the second instance by running ``` postmulti -e init diff --git a/etc/systemd/system/hosting-del.service b/etc/systemd/system/hosting-del.service index 555c659..043defe 100644 --- a/etc/systemd/system/hosting-del.service +++ b/etc/systemd/system/hosting-del.service @@ -3,4 +3,4 @@ Description=Delete old shared hosting accounts [Service] Type=simple -ExecStart=/usr/bin/php /home/daniel/hosting/find_old.php +ExecStart=/usr/bin/php /var/www/find_old.php diff --git a/etc/systemd/system/hosting.service b/etc/systemd/system/hosting.service index b2f8b92..af6233f 100644 --- a/etc/systemd/system/hosting.service +++ b/etc/systemd/system/hosting.service @@ -3,4 +3,4 @@ Description=Manage shared hosting accounts [Service] Type=simple -ExecStart=/usr/bin/php /home/daniel/hosting/cron.php +ExecStart=/usr/bin/php /var/www/cron.php diff --git a/var/www/setup.php b/var/www/setup.php index ac35499..61d7b68 100644 --- a/var/www/setup.php +++ b/var/www/setup.php @@ -21,11 +21,11 @@ try{ if(!@$db->query('SELECT null FROM settings LIMIT 1;')){ //create tables $db->exec('CREATE TABLE captcha (id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, time int(11) NOT NULL, code char(5) COLLATE latin1_bin NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin;'); + $db->exec('CREATE TABLE users (onion char(16) COLLATE latin1_bin NOT NULL PRIMARY KEY, username varchar(50) COLLATE latin1_bin NOT NULL UNIQUE, password varchar(255) COLLATE latin1_bin NOT NULL, private_key varchar(1000) COLLATE latin1_bin NOT NULL, dateadded int(10) unsigned NOT NULL, public tinyint(3) unsigned NOT NULL, php tinyint(1) unsigned NOT NULL, autoindex tinyint(1) unsigned NOT NULL, KEY public (public), KEY dateadded (dateadded)) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin;'); $db->exec('CREATE TABLE del_account (onion char(16) COLLATE latin1_bin NOT NULL PRIMARY KEY, CONSTRAINT del_account_ibfk_1 FOREIGN KEY (onion) REFERENCES users (onion) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin;'); $db->exec('CREATE TABLE new_account (onion char(16) COLLATE latin1_bin NOT NULL PRIMARY KEY, password varchar(255) COLLATE latin1_bin NOT NULL, CONSTRAINT new_account_ibfk_1 FOREIGN KEY (onion) REFERENCES users (onion) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin;'); $db->exec('CREATE TABLE pass_change (onion char(16) COLLATE latin1_bin NOT NULL PRIMARY KEY, password varchar(255) COLLATE latin1_bin NOT NULL, CONSTRAINT pass_change_ibfk_1 FOREIGN KEY (onion) REFERENCES users (onion) ON DELETE CASCADE ON UPDATE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin;'); $db->exec('CREATE TABLE settings (setting varchar(50) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL PRIMARY KEY, value text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin;'); - $db->exec('CREATE TABLE users (onion char(16) COLLATE latin1_bin NOT NULL PRIMARY KEY, username varchar(50) COLLATE latin1_bin NOT NULL UNIQUE, password varchar(255) COLLATE latin1_bin NOT NULL, private_key varchar(1000) COLLATE latin1_bin NOT NULL, dateadded int(10) unsigned NOT NULL, public tinyint(3) unsigned NOT NULL, php tinyint(1) unsigned NOT NULL, autoindex tinyint(1) unsigned NOT NULL, KEY public (public), KEY dateadded (dateadded)) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin;'); $stmt=$db->prepare("INSERT INTO settings (setting, value) VALUES ('version', ?);"); $stmt->execute([DBVERSION]); echo "Database has successfully been set up\n";