From 1ad25a38bc332d640942fdc06fe213d7a9909a35 Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Thu, 23 Oct 2014 15:48:38 +0400 Subject: [PATCH] modifier l'emplacement des templates --- apacheconfig | 2 +- lib/{ulib/support => }/apacheconfig.template/RewriteRules/.udir | 0 .../apacheconfig.template/RewriteRules/RewriteRules.conf | 0 .../apacheconfig.template/RewriteRules/lib/uinst/rootconf | 0 .../apacheconfig.template/RewriteRules/rewrite.rules | 0 .../support => }/apacheconfig.template/RewriteRules/rules.html | 0 .../support => }/apacheconfig.template/RewriteRules/update.conf | 0 .../support => }/apacheconfig.template/RewriteRules/update.sh | 0 lib/{ulib/support => }/apacheconfig.template/apacheconfig.txt | 0 .../apacheconfig.template/certsconf/default-certs.conf | 0 lib/{ulib/support => }/apacheconfig.template/cgi-bin/.udir | 0 lib/{ulib/support => }/apacheconfig.template/cgi-bin/test.cgi | 0 lib/{ulib/support => }/apacheconfig.template/modules.conf | 0 lib/{ulib/support => }/apacheconfig.template/ports.conf | 0 lib/{ulib/support => }/apacheconfig.template/sites.conf | 0 lib/{ulib/support => }/apacheconfig.template/sites/default.conf | 0 .../support => }/apacheconfig.template/sites/default.ssl.conf | 0 lib/{ulib/support => }/apacheconfig.template/workers.properties | 0 lib/{ulib/support => }/apacheconfig.template/www/.udir | 0 19 files changed, 1 insertion(+), 1 deletion(-) rename lib/{ulib/support => }/apacheconfig.template/RewriteRules/.udir (100%) rename lib/{ulib/support => }/apacheconfig.template/RewriteRules/RewriteRules.conf (100%) rename lib/{ulib/support => }/apacheconfig.template/RewriteRules/lib/uinst/rootconf (100%) rename lib/{ulib/support => }/apacheconfig.template/RewriteRules/rewrite.rules (100%) rename lib/{ulib/support => }/apacheconfig.template/RewriteRules/rules.html (100%) rename lib/{ulib/support => }/apacheconfig.template/RewriteRules/update.conf (100%) rename lib/{ulib/support => }/apacheconfig.template/RewriteRules/update.sh (100%) rename lib/{ulib/support => }/apacheconfig.template/apacheconfig.txt (100%) rename lib/{ulib/support => }/apacheconfig.template/certsconf/default-certs.conf (100%) rename lib/{ulib/support => }/apacheconfig.template/cgi-bin/.udir (100%) rename lib/{ulib/support => }/apacheconfig.template/cgi-bin/test.cgi (100%) rename lib/{ulib/support => }/apacheconfig.template/modules.conf (100%) rename lib/{ulib/support => }/apacheconfig.template/ports.conf (100%) rename lib/{ulib/support => }/apacheconfig.template/sites.conf (100%) rename lib/{ulib/support => }/apacheconfig.template/sites/default.conf (100%) rename lib/{ulib/support => }/apacheconfig.template/sites/default.ssl.conf (100%) rename lib/{ulib/support => }/apacheconfig.template/workers.properties (100%) rename lib/{ulib/support => }/apacheconfig.template/www/.udir (100%) diff --git a/apacheconfig b/apacheconfig index 0cfcfc0..decf8af 100755 --- a/apacheconfig +++ b/apacheconfig @@ -155,7 +155,7 @@ __templatectl_parseopts "$@" && \ set -- "${args[@]}" || die "$args" # répertoire source -srcdir="$ULIBDIR/support/apacheconfig.template" +srcdir="$scriptdir/lib/apacheconfig.template" # répertoire de référence autocreate= if [ -z "$destdir" ]; then diff --git a/lib/ulib/support/apacheconfig.template/RewriteRules/.udir b/lib/apacheconfig.template/RewriteRules/.udir similarity index 100% rename from lib/ulib/support/apacheconfig.template/RewriteRules/.udir rename to lib/apacheconfig.template/RewriteRules/.udir diff --git a/lib/ulib/support/apacheconfig.template/RewriteRules/RewriteRules.conf b/lib/apacheconfig.template/RewriteRules/RewriteRules.conf similarity index 100% rename from lib/ulib/support/apacheconfig.template/RewriteRules/RewriteRules.conf rename to lib/apacheconfig.template/RewriteRules/RewriteRules.conf diff --git a/lib/ulib/support/apacheconfig.template/RewriteRules/lib/uinst/rootconf b/lib/apacheconfig.template/RewriteRules/lib/uinst/rootconf similarity index 100% rename from lib/ulib/support/apacheconfig.template/RewriteRules/lib/uinst/rootconf rename to lib/apacheconfig.template/RewriteRules/lib/uinst/rootconf diff --git a/lib/ulib/support/apacheconfig.template/RewriteRules/rewrite.rules b/lib/apacheconfig.template/RewriteRules/rewrite.rules similarity index 100% rename from lib/ulib/support/apacheconfig.template/RewriteRules/rewrite.rules rename to lib/apacheconfig.template/RewriteRules/rewrite.rules diff --git a/lib/ulib/support/apacheconfig.template/RewriteRules/rules.html b/lib/apacheconfig.template/RewriteRules/rules.html similarity index 100% rename from lib/ulib/support/apacheconfig.template/RewriteRules/rules.html rename to lib/apacheconfig.template/RewriteRules/rules.html diff --git a/lib/ulib/support/apacheconfig.template/RewriteRules/update.conf b/lib/apacheconfig.template/RewriteRules/update.conf similarity index 100% rename from lib/ulib/support/apacheconfig.template/RewriteRules/update.conf rename to lib/apacheconfig.template/RewriteRules/update.conf diff --git a/lib/ulib/support/apacheconfig.template/RewriteRules/update.sh b/lib/apacheconfig.template/RewriteRules/update.sh similarity index 100% rename from lib/ulib/support/apacheconfig.template/RewriteRules/update.sh rename to lib/apacheconfig.template/RewriteRules/update.sh diff --git a/lib/ulib/support/apacheconfig.template/apacheconfig.txt b/lib/apacheconfig.template/apacheconfig.txt similarity index 100% rename from lib/ulib/support/apacheconfig.template/apacheconfig.txt rename to lib/apacheconfig.template/apacheconfig.txt diff --git a/lib/ulib/support/apacheconfig.template/certsconf/default-certs.conf b/lib/apacheconfig.template/certsconf/default-certs.conf similarity index 100% rename from lib/ulib/support/apacheconfig.template/certsconf/default-certs.conf rename to lib/apacheconfig.template/certsconf/default-certs.conf diff --git a/lib/ulib/support/apacheconfig.template/cgi-bin/.udir b/lib/apacheconfig.template/cgi-bin/.udir similarity index 100% rename from lib/ulib/support/apacheconfig.template/cgi-bin/.udir rename to lib/apacheconfig.template/cgi-bin/.udir diff --git a/lib/ulib/support/apacheconfig.template/cgi-bin/test.cgi b/lib/apacheconfig.template/cgi-bin/test.cgi similarity index 100% rename from lib/ulib/support/apacheconfig.template/cgi-bin/test.cgi rename to lib/apacheconfig.template/cgi-bin/test.cgi diff --git a/lib/ulib/support/apacheconfig.template/modules.conf b/lib/apacheconfig.template/modules.conf similarity index 100% rename from lib/ulib/support/apacheconfig.template/modules.conf rename to lib/apacheconfig.template/modules.conf diff --git a/lib/ulib/support/apacheconfig.template/ports.conf b/lib/apacheconfig.template/ports.conf similarity index 100% rename from lib/ulib/support/apacheconfig.template/ports.conf rename to lib/apacheconfig.template/ports.conf diff --git a/lib/ulib/support/apacheconfig.template/sites.conf b/lib/apacheconfig.template/sites.conf similarity index 100% rename from lib/ulib/support/apacheconfig.template/sites.conf rename to lib/apacheconfig.template/sites.conf diff --git a/lib/ulib/support/apacheconfig.template/sites/default.conf b/lib/apacheconfig.template/sites/default.conf similarity index 100% rename from lib/ulib/support/apacheconfig.template/sites/default.conf rename to lib/apacheconfig.template/sites/default.conf diff --git a/lib/ulib/support/apacheconfig.template/sites/default.ssl.conf b/lib/apacheconfig.template/sites/default.ssl.conf similarity index 100% rename from lib/ulib/support/apacheconfig.template/sites/default.ssl.conf rename to lib/apacheconfig.template/sites/default.ssl.conf diff --git a/lib/ulib/support/apacheconfig.template/workers.properties b/lib/apacheconfig.template/workers.properties similarity index 100% rename from lib/ulib/support/apacheconfig.template/workers.properties rename to lib/apacheconfig.template/workers.properties diff --git a/lib/ulib/support/apacheconfig.template/www/.udir b/lib/apacheconfig.template/www/.udir similarity index 100% rename from lib/ulib/support/apacheconfig.template/www/.udir rename to lib/apacheconfig.template/www/.udir