From 4964b5a5d5814738b4bdfb53d1662092f347bff5 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Tue, 28 Feb 2017 20:21:59 +0000
Subject: [PATCH] Update examples (#595)

---
 Makefile                                                 | 8 ++++----
 debian/liblemonldap-ng-manager-perl.examples             | 2 +-
 debian/liblemonldap-ng-portal-perl.examples              | 1 +
 lemonldap-ng-manager/MANIFEST                            | 6 +++---
 .../eg/{manager-server.cgi => manager.cgi}               | 0
 .../eg/{manager-server.fcgi => manager.fcgi}             | 0
 .../eg/{manager-server.psgi => manager.psgi}             | 0
 lemonldap-ng-portal/MANIFEST                             | 2 ++
 lemonldap-ng-portal/eg/index.cgi                         | 7 +++++++
 lemonldap-ng-portal/eg/index.fcgi                        | 9 ++++++++-
 lemonldap-ng-portal/eg/index.psgi                        | 3 +++
 11 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 debian/liblemonldap-ng-portal-perl.examples
 rename lemonldap-ng-manager/eg/{manager-server.cgi => manager.cgi} (100%)
 rename lemonldap-ng-manager/eg/{manager-server.fcgi => manager.fcgi} (100%)
 rename lemonldap-ng-manager/eg/{manager-server.psgi => manager.psgi} (100%)
 create mode 100755 lemonldap-ng-portal/eg/index.cgi
 mode change 120000 => 100755 lemonldap-ng-portal/eg/index.fcgi
 create mode 100644 lemonldap-ng-portal/eg/index.psgi

diff --git a/Makefile b/Makefile
index 148373bf1..ba7cb3142 100644
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,13 @@ DATADIR=$(LMPREFIX)/data
 DOCUMENTROOT=$(LMPREFIX)/htdocs
 PORTALDIR=$(DOCUMENTROOT)/portal
 PORTALSITEDIR=$(PORTALDIR)
-PORTALSTATICDIR=$(PORTALSITEDIR)/static
+PORTALSTATICDIR=$(PORTALSITEDIR)/htdocs/static
 PORTALRELATIVESTATICDIR=/static
 PORTALTEMPLATESDIR=$(PORTALSITEDIR)/templates
 
 MANAGERDIR=$(DOCUMENTROOT)/manager
 MANAGERSITEDIR=$(MANAGERDIR)
-MANAGERSTATICDIR=$(MANAGERSITEDIR)/static
+MANAGERSTATICDIR=$(MANAGERSITEDIR)/htdocs/static
 MANAGERRELATIVESTATICDIR=/static
 MANAGERTEMPLATESDIR=$(MANAGERSITEDIR)/templates
 DOCDIR=$(DOCUMENTROOT)
@@ -665,13 +665,13 @@ install_portal_site:	install_conf_dir
 			>$(RPORTALTEMPLATESDIR)/$$f; \
 	done; cd -
 	cd $(SRCPORTALDIR)/site/templates; for l in `find * -type l`; do \
-		echo lien à faire $$l `readlink $$l`; \
+		echo link to do $$l `readlink $$l`; \
 		target=`readlink $$l`; \
 		cd $(RPORTALTEMPLATESDIR); \
 		ln -s $$target $$l; \
 		cd -; \
 	done
-	@if test "$(USEEXTERNALLIBS)" = "yes"; then \
+	if test "$(USEEXTERNALLIBS)" = "yes"; then \
 		rm -rvf $(PORTALEXTERNALLIBS); \
 	elif test "$(USEDEBIANLIBS)" = "yes"; then \
 		rm -rvf $(PORTALLIBSTOREMOVEFORDEBIAN); \
diff --git a/debian/liblemonldap-ng-manager-perl.examples b/debian/liblemonldap-ng-manager-perl.examples
index 510df775f..e2674c0dc 100644
--- a/debian/liblemonldap-ng-manager-perl.examples
+++ b/debian/liblemonldap-ng-manager-perl.examples
@@ -1 +1 @@
-debian/tmp/usr/share/lemonldap-ng/manager/manager.*
+lemonldap-ng-manager/eg/*
diff --git a/debian/liblemonldap-ng-portal-perl.examples b/debian/liblemonldap-ng-portal-perl.examples
new file mode 100644
index 000000000..59842c8a5
--- /dev/null
+++ b/debian/liblemonldap-ng-portal-perl.examples
@@ -0,0 +1 @@
+lemonldap-ng-portal/eg/*
diff --git a/lemonldap-ng-manager/MANIFEST b/lemonldap-ng-manager/MANIFEST
index 0932244bb..253f335d7 100644
--- a/lemonldap-ng-manager/MANIFEST
+++ b/lemonldap-ng-manager/MANIFEST
@@ -1,9 +1,9 @@
 .bowerrc
 bower.json
 Changes
-eg/manager-server.cgi
-eg/manager-server.fcgi
-eg/manager-server.psgi
+eg/manager.cgi
+eg/manager.fcgi
+eg/manager.psgi
 KINEMATIC.md
 lib/Lemonldap/NG/Manager.pm
 lib/Lemonldap/NG/Manager/Attributes.pm
diff --git a/lemonldap-ng-manager/eg/manager-server.cgi b/lemonldap-ng-manager/eg/manager.cgi
similarity index 100%
rename from lemonldap-ng-manager/eg/manager-server.cgi
rename to lemonldap-ng-manager/eg/manager.cgi
diff --git a/lemonldap-ng-manager/eg/manager-server.fcgi b/lemonldap-ng-manager/eg/manager.fcgi
similarity index 100%
rename from lemonldap-ng-manager/eg/manager-server.fcgi
rename to lemonldap-ng-manager/eg/manager.fcgi
diff --git a/lemonldap-ng-manager/eg/manager-server.psgi b/lemonldap-ng-manager/eg/manager.psgi
similarity index 100%
rename from lemonldap-ng-manager/eg/manager-server.psgi
rename to lemonldap-ng-manager/eg/manager.psgi
diff --git a/lemonldap-ng-portal/MANIFEST b/lemonldap-ng-portal/MANIFEST
index 1c7c10986..c561deb2a 100644
--- a/lemonldap-ng-portal/MANIFEST
+++ b/lemonldap-ng-portal/MANIFEST
@@ -1,7 +1,9 @@
 .bowerrc
 bower.json
 Changes
+eg/index.cgi
 eg/index.fcgi
+eg/index.psgi
 example/soapconfigtest.pl
 example/soaperrortest.pl
 example/soaptest.pl
diff --git a/lemonldap-ng-portal/eg/index.cgi b/lemonldap-ng-portal/eg/index.cgi
new file mode 100755
index 000000000..a9ef6cfc9
--- /dev/null
+++ b/lemonldap-ng-portal/eg/index.cgi
@@ -0,0 +1,7 @@
+#!/usr/bin/env perl
+
+use Plack::Handler::CGI;
+use Lemonldap::NG::Portal::Main;
+
+Plack::Handler::CGI->new->run( Lemonldap::NG::Portal->run( {} ) );
+
diff --git a/lemonldap-ng-portal/eg/index.fcgi b/lemonldap-ng-portal/eg/index.fcgi
deleted file mode 120000
index 50a9bc863..000000000
--- a/lemonldap-ng-portal/eg/index.fcgi
+++ /dev/null
@@ -1 +0,0 @@
-../site/htdocs/index.fcgi
\ No newline at end of file
diff --git a/lemonldap-ng-portal/eg/index.fcgi b/lemonldap-ng-portal/eg/index.fcgi
new file mode 100755
index 000000000..abf76cd93
--- /dev/null
+++ b/lemonldap-ng-portal/eg/index.fcgi
@@ -0,0 +1,8 @@
+#!/usr/bin/env perl
+
+use Plack::Handler::FCGI;
+use Lemonldap::NG::Portal::Main;
+
+# Roll your own
+my $server = Plack::Handler::FCGI->new();
+$server->run( Lemonldap::NG::Portal::Main->run( {} ) );
diff --git a/lemonldap-ng-portal/eg/index.psgi b/lemonldap-ng-portal/eg/index.psgi
new file mode 100644
index 000000000..bc4fc74e7
--- /dev/null
+++ b/lemonldap-ng-portal/eg/index.psgi
@@ -0,0 +1,3 @@
+use Lemonldap::NG::Portal::Main;
+
+Lemonldap::NG::Portal::Main->run({});