From d55095b26b988192a209218fd00af872d9811302 Mon Sep 17 00:00:00 2001
From: Miquel Lionel <lionel@les-miquelots.net>
Date: Sun, 18 Jul 2021 12:04:08 +0100
Subject: Added file upload support and others fixes

    - Added support for file upload from master branch
    - Adjusted gpigeonctl.def file for BINPREFIX variable
    - Did cleanup of dead variables and functions. Moved
    text in their script, no need to do complicated sed.
    $text_strings use is justified in gpigeon.cgi, not in
    link-tmpl.cgi.
    - Fixed seds in the Makefile
    - Removed NotifIfDefined function, found a simpler
    way for displaying/not displaying notifs.
    - Removing $argon2id_hash variable. Unused and has its place
    in the mono-user version of gpigeon.
---
 config.def.mk | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'config.def.mk')

diff --git a/config.def.mk b/config.def.mk
index 931671f..f860bf3 100644
--- a/config.def.mk
+++ b/config.def.mk
@@ -1,20 +1,23 @@
 # Customize below to fit your system
 
 # prefixes
-BINPREFIX = /usr/local/bin
 PREFIX = /usr/share
+BINPREFIX = /usr/bin
 WWWPREFIX = /var/www
 
 # system stuff
 WWWUSER = 'www-data'
+WWWGROUP = 'www-data'
 
 # paths
-COOKIES_DIR = $(PREFIX)/gpigeon/cookies
-_GPG_HOMEDIR = $(PREFIX)/gpigeon/gnupg
-WWWDIR = $(WWWPREFIX)/gpigeon
-LINK_TEMPLATE_PATH = $(PREFIX)/gpigeon/link-tmpl.cgi
+GPIGEON_DIR=$(PREFIX)/gpigeon
+COOKIES_DIR = $(GPIGEON_DIR)/cookies
+UPLOAD_TMPDIR = $(GPIGEON_DIR)/tmp/
+LINK_TEMPLATE_PATH = $(GPIGEON_DIR)/link-tmpl.cgi
+DB_PATH=$(GPIGEON_DIR)/the.db
+_GPG_HOMEDIR = $(GPIGEON_DIR)/gnupg
 GPIGEON_PATH = $(WWWDIR)/cgi-bin/gpigeon.cgi
-DB_PATH=$(PREFIX)/gpigeon/the.db
+WWWDIR = $(WWWPREFIX)/gpigeon
 
 # one time gpg form tuning
 MSG_FORM_CHAR_LIMIT = 3000
-- 
cgit v1.2.3-70-g09d2