From f3e06436b5a6081e71c6308ca136e9ff1fa1ebef Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Sun, 13 Sep 2009 03:48:24 +0530 Subject: doc: Move templates to data/templates/ directory --- Makefile.am | 6 ++-- configure.ac | 2 ++ data/Makefile.am | 2 ++ data/templates/Makefile.am | 7 +++++ data/templates/debug.html | 56 ++++++++++++++++++++++++++++++++++++ data/templates/default.html | 23 +++++++++++++++ data/templates/stats.html | 69 +++++++++++++++++++++++++++++++++++++++++++++ doc/Makefile.am | 9 ++---- doc/debug.html | 56 ------------------------------------ doc/default.html | 23 --------------- doc/stats.html | 69 --------------------------------------------- 11 files changed, 164 insertions(+), 158 deletions(-) create mode 100644 data/Makefile.am create mode 100644 data/templates/Makefile.am create mode 100644 data/templates/debug.html create mode 100644 data/templates/default.html create mode 100644 data/templates/stats.html delete mode 100644 doc/debug.html delete mode 100644 doc/default.html delete mode 100644 doc/stats.html diff --git a/Makefile.am b/Makefile.am index a71d46b..db684cf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ CONFIG_FILES = \ m4macros/typecheck.m4 m4macros/argenable.m4 EXTRA_DIST = $(CONFIG_FILES) TODO autogen.sh -SUBDIRS = src doc packaging +SUBDIRS = src data doc packaging install-data-local: tinyproxy-configure-file tinyproxy-html-files @@ -38,8 +38,8 @@ tinyproxy-html-files: $(mkinstalldirs) $(DESTDIR)$(datadir)/tinyproxy for file in debug default stats; do \ - $(INSTALL) -m 644 $(srcdir)/doc/$$file.html $(DESTDIR)$(datadir)/tinyproxy/$$file.html.dist ; \ + $(INSTALL) -m 644 $(srcdir)/data/templates/$$file.html $(DESTDIR)$(datadir)/tinyproxy/$$file.html.dist ; \ test -f $(DESTDIR)$(datadir)/tinyproxy/$$file.html || \ - $(INSTALL) -m 644 $(srcdir)/doc/$$file.html $(DESTDIR)$(datadir)/tinyproxy/$$file.html ; \ + $(INSTALL) -m 644 $(srcdir)/data/templates/$$file.html $(DESTDIR)$(datadir)/tinyproxy/$$file.html ; \ done $(INSTALL) -m 644 $(srcdir)/doc/HTML_VARIABLES $(DESTDIR)$(datadir)/tinyproxy/HTML_VARIABLES diff --git a/configure.ac b/configure.ac index 7164905..fa969ef 100644 --- a/configure.ac +++ b/configure.ac @@ -326,6 +326,8 @@ AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") AC_CONFIG_FILES([ Makefile src/Makefile +data/Makefile +data/templates/Makefile doc/Makefile doc/man8/Makefile packaging/Makefile diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..4a03cc5 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = \ + templates diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am new file mode 100644 index 0000000..5c2f1be --- /dev/null +++ b/data/templates/Makefile.am @@ -0,0 +1,7 @@ +TEMPLATES = \ + debug.html \ + default.html \ + stats.html + +EXTRA_DIST = \ + $(TEMPLATES) diff --git a/data/templates/debug.html b/data/templates/debug.html new file mode 100644 index 0000000..6ee3367 --- /dev/null +++ b/data/templates/debug.html @@ -0,0 +1,56 @@ + + + + + + +{errno} {cause} + + + + + +

{cause}

+ +

{detail}

+ +

Here are the error variables:

+ +

request: {request}
cause: {cause}
clientip: {clientip}
clienthost: {clienthost}
version: {version}
package: {package}
date: {date}
detail: {detail}
url: {url}

+ +

Generated by {package} version {version}.

+ + + + diff --git a/data/templates/default.html b/data/templates/default.html new file mode 100644 index 0000000..67354b7 --- /dev/null +++ b/data/templates/default.html @@ -0,0 +1,23 @@ + + + + + + +{errno} {cause} + + + + + +

{cause}

+ +

{detail}

+ +

Generated by {package} version {version}.

+ + + + diff --git a/data/templates/stats.html b/data/templates/stats.html new file mode 100644 index 0000000..7179859 --- /dev/null +++ b/data/templates/stats.html @@ -0,0 +1,69 @@ + + + + + + +{package} version {version} run-time statistics + + + + + + + + +

{package} version {version} run-time statistics

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Name	Value
Number of open connections	{opens}
Number of requests	{reqs}
Number of bad connections	{badconns}
Number of denied connections	{deniedconns}
Number of refused connections due to high load	{refusedconns}

+ +

Generated by {package} version {version}.

+ + + + diff --git a/doc/Makefile.am b/doc/Makefile.am index 6cbe3cc..ade0939 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,15 +1,10 @@ SUBDIRS = \ man8 -TEMPLATES = \ - debug.html \ - default.html \ - stats.html - EXTRA_DIST = \ tinyproxy.conf \ HTML_VARIABLES \ HTTP_ERROR_CODES \ RFC_INFO \ - filter-howto.txt \ - $(TEMPLATES) + filter-howto.txt + diff --git a/doc/debug.html b/doc/debug.html deleted file mode 100644 index 6ee3367..0000000 --- a/doc/debug.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - -{errno} {cause} - - - - - -

{cause}

- -

{detail}

- -

Here are the error variables:

- -

request: {request}
cause: {cause}
clientip: {clientip}
clienthost: {clienthost}
version: {version}
package: {package}
date: {date}
detail: {detail}
url: {url}

- -

Generated by {package} version {version}.

- - - - diff --git a/doc/default.html b/doc/default.html deleted file mode 100644 index 67354b7..0000000 --- a/doc/default.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - -{errno} {cause} - - - - - -

{cause}

- -

{detail}

- -

Generated by {package} version {version}.

- - - - diff --git a/doc/stats.html b/doc/stats.html deleted file mode 100644 index 7179859..0000000 --- a/doc/stats.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - -{package} version {version} run-time statistics - - - - - - - - -

{package} version {version} run-time statistics

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Name	Value
Number of open connections	{opens}
Number of requests	{reqs}
Number of bad connections	{badconns}
Number of denied connections	{deniedconns}
Number of refused connections due to high load	{refusedconns}

- -

Generated by {package} version {version}.

- - - - -- cgit v1.2.3