pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pleroma: install nginx config unconditionally



Module Name:	pkgsrc-wip
Committed By:	xorrvin <xorrvin%pm.me@localhost>
Pushed By:	xorrvin
Date:		Mon Jun 24 18:43:48 2024 +0200
Changeset:	4c46b9132583529ac5ac630de49396c6ddc6ea08

Modified Files:
	pleroma/PLIST
	pleroma/TODO
	pleroma/pleroma.mk

Log Message:
pleroma: install nginx config unconditionally

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4c46b9132583529ac5ac630de49396c6ddc6ea08

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pleroma/PLIST      | 1 +
 pleroma/TODO       | 1 -
 pleroma/pleroma.mk | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)

diffs:
diff --git a/pleroma/PLIST b/pleroma/PLIST
index 201a7c0a09..20f3d1b762 100644
--- a/pleroma/PLIST
+++ b/pleroma/PLIST
@@ -4233,6 +4233,7 @@ lib/pleroma/releases/${PKGVERSION}/vm.args
 lib/pleroma/releases/COOKIE
 lib/pleroma/releases/start_erl.data
 share/examples/pleroma/pleroma.rc
+share/examples/pleroma/pleroma.nginx
 @pkgdir lib/pleroma/lib/tzdata-1.0.5/priv/tmp_downloads
 @pkgdir etc/pleroma
 @pkgdir var/pleroma
\ No newline at end of file
diff --git a/pleroma/TODO b/pleroma/TODO
index 7b4e5387ce..78dd42003c 100644
--- a/pleroma/TODO
+++ b/pleroma/TODO
@@ -3,5 +3,4 @@
 
 - Investigate bundling of Erlang: LD_LIBRARY_PATH/LD_PRELOAD_PATH ?
 - Decouple frontend (pleroma's "feature")
-- Add options.mk for nginx and postgresql
 - Add rc.d script
\ No newline at end of file
diff --git a/pleroma/pleroma.mk b/pleroma/pleroma.mk
index a9ce13521b..ba5c364fc1 100644
--- a/pleroma/pleroma.mk
+++ b/pleroma/pleroma.mk
@@ -66,6 +66,5 @@ install: release/.release-done
 	$(INSTALL_DIR) $(TARGET_PREFIX)/var/pleroma
 	$(INSTALL_DIR) $(TARGET_PREFIX)/share/examples/pleroma
 
-# only install if nginx option is enabled
-#	$(INSTALL_DATA) installation/pleroma.nginx $(TARGET_PREFIX)/share/examples
+	$(INSTALL_DATA) installation/pleroma.nginx $(TARGET_PREFIX)/share/examples
 	$(INSTALL_DATA) installation/netbsd/rc.d/pleroma $(TARGET_PREFIX)/share/examples/pleroma/pleroma.rc


Home | Main Index | Thread Index | Old Index