public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/sqlgrey/files/, mail-filter/sqlgrey/
@ 2016-11-26 19:08 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2016-11-26 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     1a34370c22e9d57dbf10f3830528b19c17704d5d
Author:     Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Thu Jun 30 15:55:03 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 19:08:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a34370c

mail-filter/sqlgrey: systemd .service hardening

Bug: https://bugs.gentoo.org/587596
Closes: https://github.com/gentoo/gentoo/pull/1800

 mail-filter/sqlgrey/files/sqlgrey.service                   | 13 +++++++++++++
 .../{sqlgrey-1.7.6-r1.ebuild => sqlgrey-1.7.6-r2.ebuild}    |  0
 2 files changed, 13 insertions(+)

diff --git a/mail-filter/sqlgrey/files/sqlgrey.service b/mail-filter/sqlgrey/files/sqlgrey.service
index f6be356..a317186 100644
--- a/mail-filter/sqlgrey/files/sqlgrey.service
+++ b/mail-filter/sqlgrey/files/sqlgrey.service
@@ -3,7 +3,20 @@ Description=SQLgrey Postfix Grey-listing Policy service
 After=network.target
 
 [Service]
+User=sqlgrey
+Group=sqlgrey
 ExecStart=/usr/sbin/sqlgrey
+CapabilityBoundingSet=
+PrivateTmp=yes
+PrivateDevices=yes
+ProtectSystem=full
+ProtectHome=yes
+NoNewPrivileges=yes
+MemoryDenyWriteExecute=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+RestrictRealtime=true
 
 [Install]
 WantedBy=multi-user.target

diff --git a/mail-filter/sqlgrey/sqlgrey-1.7.6-r1.ebuild b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
similarity index 100%
rename from mail-filter/sqlgrey/sqlgrey-1.7.6-r1.ebuild
rename to mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/sqlgrey/files/, mail-filter/sqlgrey/
@ 2019-11-10 13:24 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2019-11-10 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     de2c9c7cc5c8c1e28fe64de78283650e16e3b7af
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 13:22:28 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 13:23:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2c9c7c

mail-filter/sqlgrey: Bump to EAPI 7

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch |  4 +-
 mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild        | 74 ++++++++++------------
 2 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch b/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
index 48d3a581c5d..355cb453924 100644
--- a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
+++ b/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
@@ -1,5 +1,5 @@
---- ./sqlgrey-1.7.6/init/sqlgrey.gentoo.orig	2007-05-12 11:12:12.000000000 +0200
-+++ ./sqlgrey-1.7.6/init/sqlgrey.gentoo		2007-05-12 12:05:52.491468250 +0200
+--- sqlgrey-1.7.6/init/sqlgrey.gentoo.orig	2007-05-12 11:12:12.000000000 +0200
++++ sqlgrey-1.7.6/init/sqlgrey.gentoo		2007-05-12 12:05:52.491468250 +0200
 @@ -14,13 +14,13 @@
  	# SQLite puts files in the working directory
  	cd ~sqlgrey

diff --git a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
index a6f49463e7b..4b26a8203a6 100644
--- a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
+++ b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
@@ -1,41 +1,42 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils systemd user
+inherit systemd user
 
-DESCRIPTION="SQLgrey is a postfix policy service implementing a grey-listing policy"
-SRC_URI="mirror://sourceforge/sqlgrey/${P}.tar.bz2"
+DESCRIPTION="A postfix policy service implementing a grey-listing policy"
 HOMEPAGE="http://sqlgrey.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sqlgrey/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="mysql postgres sqlite"
+KEYWORDS="amd64 ~arm ~sparc x86"
+IUSE="mysql +postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
 RDEPEND="dev-lang/perl
 	dev-perl/DBI
-	dev-perl/Net-Server
 	dev-perl/Date-Calc
+	dev-perl/Net-Server
 	virtual/mailx
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )
 	mysql? ( dev-perl/DBD-mysql )
-	!postgres? ( !mysql? ( !sqlite? ( dev-perl/DBD-Pg ) ) )"
-DEPEND="$RDEPEND
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}
 	sys-apps/sed"
-KEYWORDS="amd64 ~arm ~sparc x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-init.patch"
+)
 
 pkg_setup() {
 	enewgroup sqlgrey
 	enewuser sqlgrey -1 -1 /var/spool/sqlgrey sqlgrey
 }
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-init.patch"
-}
-
 src_install () {
-	make gentoo-install ROOTDIR="${D}"
+	emake gentoo-install ROOTDIR="${D}"
 	dodoc HOWTO FAQ README README.OPTINOUT README.PERF TODO Changelog
 
 	# keeps SQLgrey data in /var/spool/sqlgrey
@@ -46,34 +47,29 @@ src_install () {
 }
 
 pkg_postinst() {
-	echo
-	einfo "To make use of greylisting, please update your postfix config."
-	einfo
-	einfo "Put something like this in /etc/postfix/main.cf:"
-	einfo "    smtpd_recipient_restrictions ="
-	einfo "           ..."
-	einfo "           check_policy_service inet:127.0.0.1:2501"
-	einfo
-	einfo "Remember to restart Postfix after that change. Also remember"
-	einfo "to make the daemon start durig boot:"
-	einfo "  rc-update add sqlgrey default"
-	einfo
-	echo
-	einfo "To setup SQLgrey to run out-of-the-box on your system, run:"
-	einfo "emerge --config ${PN}"
-	echo
+	elog "To make use of greylisting, please update your postfix config."
+	elog
+	elog "Put something like this in /etc/postfix/main.cf:"
+	elog "    smtpd_recipient_restrictions ="
+	elog "           ..."
+	elog "           check_policy_service inet:127.0.0.1:2501"
+	elog
+	elog "Remember to restart Postfix after that change. Also remember"
+	elog "to make the daemon start durig boot:"
+	elog "  rc-update add sqlgrey default"
+	elog
+	elog
+	elog "To setup SQLgrey to run out-of-the-box on your system, run:"
+	elog "emerge --config ${PN}"
+	elog
 	ewarn "Read the documentation for more info (perldoc sqlgrey) or the"
 	ewarn "included howto /usr/share/doc/${PF}/HOWTO.gz"
-	echo
+	ewarn
 	ewarn "If you are using MySQL >= 4.1 use \"latin1\" as charset for"
 	ewarn "the SQLgrey db"
-	echo
-	ebeep 2
-	epause 5
 }
 
 pkg_config () {
-
 	# SQLgrey configuration file
 	local SQLgrey_CONFIG="/etc/sqlgrey/sqlgrey.conf"
 	local SQLgrey_DB_USER_NAME="sqlgrey"


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: mail-filter/sqlgrey/files/, mail-filter/sqlgrey/
@ 2021-07-15 19:02 Conrad Kostecki
  0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-07-15 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     d752762ff8271d4ad9922b84d6c64d5fb266aea2
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 15 19:02:24 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jul 15 19:02:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d752762f

mail-filter/sqlgrey: drop old version

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 mail-filter/sqlgrey/Manifest                       |   1 -
 mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch |  18 --
 mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild        | 252 ---------------------
 3 files changed, 271 deletions(-)

diff --git a/mail-filter/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index a1d23dbdd3b..d4cf7b1cac0 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -1,2 +1 @@
-DIST sqlgrey-1.7.6.tar.bz2 63738 BLAKE2B 7835079f3f220c2894781cb1ba8d1cac66f46e9fad7f17bfc0f1f7e2cfe1b1b05664179abacb873acf1829114093c48764c34e1a0a3128503f8e3f134dd0772d SHA512 62822d808aa5991a8d29f455be933cf782c9d5232b63bd1f357093a06982474018fb7a02dedf29274d8b7e9f12525063e6af744efceecf420cd01e74f561aa81
 DIST sqlgrey-1.8.0.tar.gz 69476 BLAKE2B f48aa9e41a988338a817026fbf022e145922db0bad9983e4d7cde7bc621560ce6189e494cfba5dd5f48ba4ff30e47686c54298f9a006b8fcc2b27444e102b0d1 SHA512 97ab057bf7111159166a6963d5948c10468731730136ddca6449d2d629f39235c09d00497a52408bb87057905c1bf43bc064571ee6302d7f1f8c6408af82d044

diff --git a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch b/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
deleted file mode 100644
index 355cb453924..00000000000
--- a/mail-filter/sqlgrey/files/sqlgrey-1.7.6-init.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- sqlgrey-1.7.6/init/sqlgrey.gentoo.orig	2007-05-12 11:12:12.000000000 +0200
-+++ sqlgrey-1.7.6/init/sqlgrey.gentoo		2007-05-12 12:05:52.491468250 +0200
-@@ -14,13 +14,13 @@
- 	# SQLite puts files in the working directory
- 	cd ~sqlgrey
- 	sqlgrey -d
--	eend
-+	eend $?
- }
- 
- stop() {
- 	ebegin "Shutting down SQLgrey"
- 	sqlgrey -k
--	eend
-+	eend $?
- }
- 
- # hack: seems Net::Server doesn't set REUSEADDR on socket?

diff --git a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild b/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
deleted file mode 100644
index 1e7d2013e06..00000000000
--- a/mail-filter/sqlgrey/sqlgrey-1.7.6-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="A postfix policy service implementing a grey-listing policy"
-HOMEPAGE="http://sqlgrey.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sqlgrey/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="mysql +postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="dev-lang/perl
-	dev-perl/DBI
-	dev-perl/Date-Calc
-	dev-perl/Net-Server
-	virtual/mailx
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-PATCHES=(
-	"${FILESDIR}/${P}-init.patch"
-)
-
-pkg_setup() {
-	enewgroup sqlgrey
-	enewuser sqlgrey -1 -1 /var/spool/sqlgrey sqlgrey
-}
-
-src_install() {
-	emake gentoo-install ROOTDIR="${D}"
-	dodoc HOWTO FAQ README README.OPTINOUT README.PERF TODO Changelog
-
-	# keeps SQLgrey data in /var/spool/sqlgrey
-	diropts -m0775 -o sqlgrey -g sqlgrey
-	keepdir /var/spool/sqlgrey
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	elog "To make use of greylisting, please update your postfix config."
-	elog
-	elog "Put something like this in /etc/postfix/main.cf:"
-	elog "    smtpd_recipient_restrictions ="
-	elog "           ..."
-	elog "           check_policy_service inet:127.0.0.1:2501"
-	elog
-	elog "Remember to restart Postfix after that change. Also remember"
-	elog "to make the daemon start durig boot:"
-	elog "  rc-update add sqlgrey default"
-	elog
-	elog
-	elog "To setup SQLgrey to run out-of-the-box on your system, run:"
-	elog "emerge --config ${PN}"
-	elog
-	ewarn "Read the documentation for more info (perldoc sqlgrey) or the"
-	ewarn "included howto /usr/share/doc/${PF}/HOWTO.gz"
-	ewarn
-	ewarn "If you are using MySQL >= 4.1 use \"latin1\" as charset for"
-	ewarn "the SQLgrey db"
-}
-
-pkg_config() {
-	# SQLgrey configuration file
-	local SQLgrey_CONFIG="/etc/sqlgrey/sqlgrey.conf"
-	local SQLgrey_DB_USER_NAME="sqlgrey"
-	local SQLgrey_DB_NAME="sqlgrey"
-
-	# Check if a password is set in sqlgrey.conf
-	local SQLgrey_CONF_PWD=""
-	if [ -f "${SQLgrey_CONFIG}" ]; then
-		if (grep -iq "^[\t ]*db_pass[\t ]*=[\t ]*.*$" ${SQLgrey_CONFIG}); then
-			# User already has a db_pass entry
-			SQLgrey_CONF_PWD="$(sed -n 's:^[\t ]*db_pass[\t ]*=[\t ]*\(.*\)[\t ]*:\1:gIp' ${SQLgrey_CONFIG})"
-		else
-			SQLgrey_CONF_PWD=""
-		fi
-	else
-		ewarn "SQLgrey configuration missing. Exiting now."
-		echo
-		exit 0
-	fi
-
-	# Check if we need SQLgrey to configure for this system or not
-	local SQLgrey_DB_HOST="localhost"
-	local SQLgrey_KEY_INPUT="l,r,x"
-	einfo "SQLgrey database backend configuration"
-	einfo "  Please select where SQLgrey database will run:"
-	einfo "    [l] Database backend runs on localhost"
-	einfo "    [r] Database backend runs on remote host"
-	einfo "    [x] Exit"
-	echo
-	einfo "  Press one of the keys [${SQLgrey_KEY_INPUT}]: "
-	while true; do
-		read -n 1 -s SQLgrey_ACCESS_TYPE
-		case "${SQLgrey_ACCESS_TYPE}" in
-			"r" | "R" )
-				SQLgrey_ACCESS_TYPE="r"
-				einfo "  remote setup"
-				read -p "     Please enter the remote hostname: " SQLgrey_DB_HOST
-				echo
-				break
-			;;
-			"l" | "L" )
-				SQLgrey_ACCESS_TYPE="l"
-				einfo "  local setup"
-				echo
-				break
-			;;
-			"x" | "X" )
-				exit 0
-			;;
-		esac
-	done
-
-	# Generate random password
-	if [[ "${SQLgrey_CONF_PWD}" == "" ]]; then
-		einfo "Generating random database user password..."
-		local SQLgrey_PWD_MATRIX="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-		local SQLgrey_DB_USER_PWD=""
-		while [ "${n:=1}" -le "16" ]; do
-			SQLgrey_DB_USER_PWD="${SQLgrey_DB_USER_PWD}${SQLgrey_PWD_MATRIX:$(($RANDOM%${#SQLgrey_PWD_MATRIX})):1}"
-			let n+=1
-		done
-	else
-		einfo "Reusing current database user password..."
-		local SQLgrey_DB_USER_PWD="${SQLgrey_CONF_PWD}"
-	fi
-	echo
-
-	# Configure the various database backends
-	local SQLgrey_KEY_INPUT=""
-	einfo "Creating SQLgrey database backend data and configuration"
-	einfo "  Please select what kind of database you like to use:"
-	if use postgres || has_version dev-perl/DBD-Pg ; then
-		einfo "    [p] PostgreSQL"
-		SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},p"
-	fi
-	if use mysql || has_version dev-perl/DBD-mysql ; then
-		einfo "    [m] MySQL"
-		SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},m"
-	fi
-	if use sqlite || has_version dev-perl/DBD-SQLite ; then
-		einfo "    [s] SQLite"
-		SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},s"
-	fi
-	einfo "    [x] Exit"
-	SQLgrey_KEY_INPUT="${SQLgrey_KEY_INPUT},x"
-	echo
-	einfo "  Press one of the keys [${SQLgrey_KEY_INPUT:1}]: "
-	while true; do
-		read -n 1 -s SQLgrey_DB_TYPE
-		case "${SQLgrey_DB_TYPE}" in
-			"p" | "P" )
-				SQLgrey_DB_TYPE="p"
-				einfo "  PostgreSQL database backend"
-				echo
-				break
-			;;
-			"m" | "M" )
-				SQLgrey_DB_TYPE="m"
-				einfo "  MySQL database backend"
-				echo
-				break
-			;;
-			"s" | "S" )
-				SQLgrey_DB_TYPE="s"
-				einfo "  SQLite database backend"
-				echo
-				break
-			;;
-			"x" | "X" )
-				exit 0
-			;;
-		esac
-	done
-
-	# If we don't use SQLite, the password must not be set
-	if [[ ( "${SQLgrey_DB_TYPE}" != "s" ) && ( "${SQLgrey_CONF_PWD}" != "" ) ]]; then
-		ewarn "This configuration is only for new installations. You seem to"
-		ewarn "have already a modified sqlgrey.conf"
-		ewarn "Do you want to continue?"
-		SQLgrey_KEY_INPUT="y,n"
-		einfo "   Press one of the keys [$SQLgrey_KEY_INPUT]: "
-		while true; do
-			read -n 1 -s SQLgrey_Ignore
-			case "$SQLgrey_Ignore" in
-				"y"|"Y" )
-					break
-				;;
-				"n"|"N" )
-					exit 0
-				;;
-			esac
-		done
-	fi
-
-	## Per-RDBMS configuration ##
-	# POSTGRESQL
-	if [[ "${SQLgrey_DB_TYPE}" == "p" ]] ; then
-
-		ewarn "If prompted for a password, please enter your PgSQL postgres password"
-		ewarn ""
-
-		einfo "Creating SQLgrey PostgreSQL database \"${SQLgrey_DB_NAME}\" and user \"${SQLgrey_DB_USER_NAME}\""
-		/usr/bin/psql -h ${SQLgrey_DB_HOST} -d template1 -U postgres -c "CREATE USER ${SQLgrey_DB_USER_NAME} WITH PASSWORD '${SQLgrey_DB_USER_PWD}' NOCREATEDB NOCREATEUSER; CREATE DATABASE ${SQLgrey_DB_NAME}; GRANT ALL PRIVILEGES ON DATABASE ${SQLgrey_DB_NAME} TO ${SQLgrey_DB_USER_NAME}; GRANT ALL PRIVILEGES ON SCHEMA public TO ${SQLgrey_DB_USER_NAME}; UPDATE pg_database SET datdba=(SELECT usesysid FROM pg_shadow WHERE usename='${SQLgrey_DB_USER_NAME}') WHERE datname='${SQLgrey_DB_NAME}';"
-
-		einfo "Changing SQLgrey configuration in sqlgrey.conf"
-		sed -i "s:^[# ]*\(db_type[ \t]*= \).*:\1Pg:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_user[ \t]*= \).*:\1${SQLgrey_DB_USER_NAME}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_pass[ \t]*= \).*:\1${SQLgrey_DB_USER_PWD}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_host[ \t]*= \).*:\1${SQLgrey_DB_HOST}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_name[ \t]*= \).*:\1${SQLgrey_DB_NAME}:gI" ${SQLgrey_CONFIG}
-	elif [[ "${SQLgrey_DB_TYPE}" == "m" ]] ; then
-	# MYSQL
-		ewarn "If prompted for a password, please enter your MySQL root password"
-		ewarn ""
-
-		einfo "Creating SQLgrey MySQL database \"${SQLgrey_DB_NAME}\" and user \"${SQLgrey_DB_USER_NAME}\""
-		echo -ne "     "
-		/usr/bin/mysql -u root -h ${SQLgrey_DB_HOST} -p -e "CREATE DATABASE IF NOT EXISTS ${SQLgrey_DB_NAME} CHARACTER SET latin1; GRANT ALL ON ${SQLgrey_DB_NAME}.* TO ${SQLgrey_DB_USER_NAME}@${SQLgrey_DB_HOST} IDENTIFIED BY '${SQLgrey_DB_USER_PWD}';FLUSH PRIVILEGES;" -D mysql
-		echo
-
-		einfo "Changing SQLgrey configuration in sqlgrey.conf"
-		sed -i "s:^[# ]*\(db_type[ \t]*= \).*:\1mysql:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_user[ \t]*= \).*:\1${SQLgrey_DB_USER_NAME}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_pass[ \t]*= \).*:\1${SQLgrey_DB_USER_PWD}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_host[ \t]*= \).*:\1${SQLgrey_DB_HOST}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_name[ \t]*= \).*:\1${SQLgrey_DB_NAME}:gI" ${SQLgrey_CONFIG}
-	elif [[ "${SQLgrey_DB_TYPE}" == "s" ]] ; then
-		einfo "Changing SQLgrey configuration in sqlgrey.conf"
-		sed -i "s:^[# ]*\(db_type[ \t]*= \).*:\1SQLite:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_name[ \t]*= \).*:\1${SQLgrey_DB_NAME}:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_user[ \t]*=.*\)$:# \1:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_pass[ \t]*= .*\)$:# \1:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_host[ \t]*= .*\)$:# \1:gI" ${SQLgrey_CONFIG}
-		sed -i "s:^[# ]*\(db_cleandelay[ \t]*= .*\)$:# \1:gI" ${SQLgrey_CONFIG}
-	fi
-	echo
-	if [[ "${SQLgrey_DB_TYPE}" != "s" ]]; then
-		einfo "Note: the database password is stored in $SQLgrey_CONFIG"
-	fi
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-07-15 19:02 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-15 19:02 [gentoo-commits] repo/gentoo:master commit in: mail-filter/sqlgrey/files/, mail-filter/sqlgrey/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2019-11-10 13:24 Michał Górny
2016-11-26 19:08 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox