From 949ccfc6d22e092d429145f75d6e2f3af39d49b1 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 19 Mar 2013 18:50:53 +0000 Subject: [PATCH] Don't hardcode, use passenger-config(1). --- www/puppet-dashboard/Makefile | 4 ++-- www/puppet-dashboard/pkg/README | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/www/puppet-dashboard/Makefile b/www/puppet-dashboard/Makefile index 638e812e612..8ad5c351ac1 100644 --- a/www/puppet-dashboard/Makefile +++ b/www/puppet-dashboard/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.17 2013/03/19 18:18:38 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.18 2013/03/19 18:50:53 ajacoutot Exp $ COMMENT= overview of your Puppet ecosystem DISTNAME= puppet-dashboard-1.2.22 CATEGORIES= www sysutils -REVISION= 3 +REVISION= 4 HOMEPAGE= https://puppetlabs.com/puppet/related-projects/dashboard/ diff --git a/www/puppet-dashboard/pkg/README b/www/puppet-dashboard/pkg/README index c70a8b0bfb0..33a2326c671 100644 --- a/www/puppet-dashboard/pkg/README +++ b/www/puppet-dashboard/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.5 2013/03/19 18:18:38 ajacoutot Exp $ +$OpenBSD: README,v 1.6 2013/03/19 18:50:53 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -92,13 +92,17 @@ Next, ${SYSCONFDIR}/nginx/nginx.conf needs to be modified with the following requirements as a start: * http{} block - passenger_root ${LOCALBASE}/lib/phusion-passengerXX; - passenger_ruby ${LOCALBASE}/bin/rubyXX; -(where XX is the ruby(1) BINREV, e.g. 19) + passenger_root /path/to/passenger; + passenger_ruby /path/to/ruby; + +Where: +/path/to/passenger = `passenger-configXX --root` +/path/to/ruby = `which rubyXX` +"XX" is the ruby(1) BINREV used by Passenger, e.g. 19. * server{} block listen 3000; - root /var/www/puppet-dashboard/public; + root ${INSTDIR}/public; passenger_enabled on; The nginx(8) daemon installed from packages(7) is started by the