Skip to content
Snippets Groups Projects
Commit 87834105 authored by Guillaume ROUSSE's avatar Guillaume ROUSSE
Browse files

use shorter file names

parent 625fb392
Branches
Tags
No related merge requests found
...@@ -46,7 +46,7 @@ pod2usage( ...@@ -46,7 +46,7 @@ pod2usage(
) unless $action; ) unless $action;
my $configuration = IdPAccountManager::Configuration->new( my $configuration = IdPAccountManager::Configuration->new(
file => '@sysconfdir@/IdPAccountManager.conf' file => '@sysconfdir@/manager.conf'
); );
IdPAccountManager::DB->register_db( IdPAccountManager::DB->register_db(
......
...@@ -9,7 +9,7 @@ use IdPAccountManager::Configuration; ...@@ -9,7 +9,7 @@ use IdPAccountManager::Configuration;
use IdPAccountManager::WebRequest; use IdPAccountManager::WebRequest;
my $configuration = IdPAccountManager::Configuration->new( my $configuration = IdPAccountManager::Configuration->new(
file => '@sysconfdir@/IdPAccountManager.conf' file => '@sysconfdir@/manager.conf'
); );
my $request = new IdPAccountManager::WebRequest( my $request = new IdPAccountManager::WebRequest(
......
noinst_DATA = IdPAccountManager.conf noinst_DATA = manager.conf
extra_DIST = manager.conf.in
manager.conf: Makefile manager.conf.in
sed \
-e 's|[@]templatesdir[@]|$(templatesdir)|' \
-e 's|[@]sysconfdir[@]|$(sysconfdir)|' \
< $(srcdir)/$@.in > $@
chmod +x $@
install-data-local: install-data-local:
if [ -f $(DESTDIR)$(sysconfdir)/IdPAccountManager.conf ]; then \ if [ -f $(DESTDIR)$(sysconfdir)/manager.conf ]; then \
$(INSTALL_DATA) $(srcdir)/IdPAccountManager.conf $(DESTDIR)$(sysconfdir)/IdPAccountManager.conf.new; \ $(INSTALL_DATA) $(srcdir)/manager.conf $(DESTDIR)$(sysconfdir)/manager.conf.new; \
else \ else \
$(INSTALL_DATA) $(srcdir)/IdPAccountManager.conf $(DESTDIR)$(sysconfdir)/IdPAccountManager.conf; \ $(INSTALL_DATA) $(srcdir)/manager.conf $(DESTDIR)$(sysconfdir)/manager.conf; \
fi fi
...@@ -26,7 +26,7 @@ idp_displayname = eduGAIN Access Check ...@@ -26,7 +26,7 @@ idp_displayname = eduGAIN Access Check
root_ssp_dir = /opt/testidp/simplesamlphp root_ssp_dir = /opt/testidp/simplesamlphp
# Templates directory # Templates directory
templates_dir = templates templates_dir = @templatesdir@
# Database type refers to a Perl Database Driver name # Database type refers to a Perl Database Driver name
# However only a subset of existing DBDs are supported by Rose::DB::Object: # However only a subset of existing DBDs are supported by Rose::DB::Object:
...@@ -71,7 +71,7 @@ dev_sp_contact = john@my.fqdn, sarah@my.fqdn ...@@ -71,7 +71,7 @@ dev_sp_contact = john@my.fqdn, sarah@my.fqdn
notice_from = edugain-access-check.fqdn notice_from = edugain-access-check.fqdn
# federation metadata local copy path # federation metadata local copy path
federation_metadata_file_path = /opt/testidp/IdPAccountManager/conf/edugain-md.xml federation_metadata_file_path = @sysconfdir@/edugain-md.xml
# Valid account profiles # Valid account profiles
account_profiles = fullset1, limitedset1, generic1, student1, student2, teacher1, teacher2, alumni1, librarywalkin1, employee1, researcher1 account_profiles = fullset1, limitedset1, generic1, student1, student2, teacher1, teacher2, alumni1, librarywalkin1, employee1, researcher1
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([IdP Account Manager], 0.1) AC_INIT([Account Manager], 0.1)
AM_INIT_AUTOMAKE([foreign]) AM_INIT_AUTOMAKE([foreign])
wwwdir=$datadir/idp-account-manager/www wwwdir=$datadir/account-manager/www
modulesdir=$datadir/idp-account-manager/lib modulesdir=$datadir/account-manager/lib
templatesdir=$datadir/idp-account-manager/templates templatesdir=$datadir/account-manager/templates
AC_SUBST(wwwdir) AC_SUBST(wwwdir)
AC_SUBST(modulesdir) AC_SUBST(modulesdir)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment