From ce20926ce6501a26d2e1bd5c1ef893f684a16089 Mon Sep 17 00:00:00 2001 From: "Piotr F. Mieszkowski" Date: Sat, 2 Dec 2023 18:53:28 +0100 Subject: [PATCH] Rename project from gpg-mailgate to lacre --- cron.py | 12 ++++++------ public_html/config.default.php | 12 ++++++------ public_html/confirm.php | 10 +++++----- public_html/include/common.php | 12 ++++++------ public_html/include/config.php | 10 +++++----- public_html/include/dbconnect.php | 10 +++++----- public_html/include/language.php | 10 +++++----- public_html/include/lock.php | 12 ++++++------ public_html/include/pgp.php | 10 +++++----- public_html/index.php | 10 +++++----- public_html/language/english.php | 10 +++++----- schema.sql | 25 +++++++++++++++++++++---- 12 files changed, 80 insertions(+), 63 deletions(-) diff --git a/cron.py b/cron.py index 625963e..8ecd455 100644 --- a/cron.py +++ b/cron.py @@ -1,22 +1,22 @@ #!/usr/bin/python # -# gpg-mailgate +# lacre # -# This file is part of the gpg-mailgate source code. +# This file is part of the lacre source code. # -# gpg-mailgate is free software: you can redistribute it and/or modify +# lacre is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# gpg-mailgate source code is distributed in the hope that it will be useful, +# lacre source code is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with gpg-mailgate source code. If not, see . +# along with lacre source code. If not, see . # from configparser import RawConfigParser @@ -88,7 +88,7 @@ def define_db_schema(): return (gpgmw_keys) -# Read configuration from /etc/gpg-mailgate.conf +# Read configuration from /etc/lacre.conf conf.load_config() lacre.init_logging(conf.get_item('logging', 'config')) diff --git a/public_html/config.default.php b/public_html/config.default.php index 02a68ca..b576cea 100644 --- a/public_html/config.default.php +++ b/public_html/config.default.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ @@ -29,7 +29,7 @@ $config['email_web'] = 'admin@example.com'; //address to send emails from -$config['email_from'] = 'gpg-mailgate-web@example.com'; +$config['email_from'] = 'lacre-web@example.com'; //this will be used as the subject when a user requests to add a PGP key $config['email_subject_requestpgp'] = 'Confirm your email address'; diff --git a/public_html/confirm.php b/public_html/confirm.php index 0b52163..017a4eb 100644 --- a/public_html/confirm.php +++ b/public_html/confirm.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ diff --git a/public_html/include/common.php b/public_html/include/common.php index 37f0545..23bbb43 100644 --- a/public_html/include/common.php +++ b/public_html/include/common.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ @@ -36,7 +36,7 @@ function includePath() { return substr($self, 0, $lastSlash + 1); } -//returns a relative path to the gpg-mailgate-web web root directory, without trailing slash +//returns a relative path to the lacre-web web root directory, without trailing slash function basePath() { $commonPath = __FILE__; $requestPath = $_SERVER['SCRIPT_FILENAME']; diff --git a/public_html/include/config.php b/public_html/include/config.php index ee07102..f96ae4b 100644 --- a/public_html/include/config.php +++ b/public_html/include/config.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ diff --git a/public_html/include/dbconnect.php b/public_html/include/dbconnect.php index a7a3f07..0e8771b 100644 --- a/public_html/include/dbconnect.php +++ b/public_html/include/dbconnect.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ diff --git a/public_html/include/language.php b/public_html/include/language.php index ad3bed9..1e91a2c 100644 --- a/public_html/include/language.php +++ b/public_html/include/language.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ diff --git a/public_html/include/lock.php b/public_html/include/lock.php index 4fc46a5..0567554 100644 --- a/public_html/include/lock.php +++ b/public_html/include/lock.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ @@ -39,7 +39,7 @@ function checkLock($action) { $ip = $_SERVER['REMOTE_ADDR']; - $result = databaseQuery("SELECT id, time, num FROM gpgmw_locks WHERE ip = ? AND action = ?", array($ip, $action), true); + $result = databaseQuery("SELECT id, time, num FROM lacre_locks WHERE ip = ? AND action = ?", array($ip, $action), true); if($row = $result->fetch()) { $id = $row['id']; $time = $row['time']; diff --git a/public_html/include/pgp.php b/public_html/include/pgp.php index b164158..1c63ae3 100644 --- a/public_html/include/pgp.php +++ b/public_html/include/pgp.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ diff --git a/public_html/index.php b/public_html/index.php index eb24bc0..9e743b3 100644 --- a/public_html/index.php +++ b/public_html/index.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ diff --git a/public_html/language/english.php b/public_html/language/english.php index e2a992c..67f1224 100644 --- a/public_html/language/english.php +++ b/public_html/language/english.php @@ -1,22 +1,22 @@ . + along with lacre source code. If not, see . */ diff --git a/schema.sql b/schema.sql index 4ba88e9..12ff89c 100644 --- a/schema.sql +++ b/schema.sql @@ -1,5 +1,22 @@ --- confirm is empty once an email address has been confirmed, and otherwise is the confirmation key --- status +-- lacre +-- +-- This file is part of the lacre source code. +-- +-- lacre is free software: you can redistribute it and/or modify it under the +-- terms of the GNU General Public License as published by the Free Software +-- Foundation, either version 3 of the License, or (at your option) any later +-- version. +-- +-- lacre source code is distributed in the hope that it will be useful, but +-- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +-- more details. +-- +-- You should have received a copy of the GNU General Public License along +-- with lacre source code. If not, see . + +-- confirm is empty once an email address has been confirmed, and otherwise is +-- the confirmation key status -- initializes to 0 -- is set to 1 after a public key with (confirm='', status=0) has been imported -- is set to 2 if a key should be deleted (will be deleted based on email address) @@ -22,10 +39,10 @@ CREATE TABLE lacre_locks ( num INT ); --- GnuPG identities known to Lacre. +-- GnuPG identities known to lacre. -- -- This table can be used instead of the file-based key store (pubring.kbx). --- Set Lacre configuration option [keyring]type to 'database' to use this +-- Set lacre configuration option [keyring]type to 'database' to use this -- table. CREATE TABLE lacre_identities ( email VARCHAR (256) NOT NULL PRIMARY KEY,