asciidoc-pve.conf: use extra asciidoc configuration file

We can define PVE related attributes here (will replace attributes.txt).
Install all asciidoc-pve config files to /usr/share/pve-doc-generator/asciidoc

diff --git a/Makefile b/Makefile
index 292cb5d998ddc0a12d785fcf9e6abba209316fa4..64826faff06aa3c9525c51713d521d6df7c2a469 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -153,8 +153,10 @@ ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB}: index.html ${INDEX_INCLUDES} ${WIKI_IMPO
        mkdir -p build/usr/bin
        install -m 0644 ${GEN_DEB_SOURCES} build/usr/share/${GEN_PACKAGE}
        install -m 0755 ${GEN_SCRIPTS} build/usr/share/${GEN_PACKAGE}
+       # install asciidoc-pve
        install -m 0755 asciidoc-pve build/usr/bin/
-       install -D -m 0644 asciidoc/mediawiki.conf build/etc/asciidoc/mediawiki.conf
+       install -D -m 0644 asciidoc/mediawiki.conf build/usr/share/${GEN_PACKAGE}/asciidoc/mediawiki.conf
+       install -m 0644 asciidoc/asciidoc-pve.conf build/usr/share/${GEN_PACKAGE}/asciidoc/
        # install files for pvedocs package
        mkdir -p build/usr/share/${DOC_PACKAGE}
        mkdir -p build/usr/share/doc/${DOC_PACKAGE}

diff --git a/asciidoc-pve.in b/asciidoc-pve.in
index 8550bac19327bc52ef06c39f282ec7d9ac5534d9..f56eaeaf7d183c31270afc067fbf6b9f6bbc9eb1 100644 (file)
--- a/asciidoc-pve.in
+++ b/asciidoc-pve.in
@@ -28,8 +28,8 @@ my $tmpprefix = ".asciidoc-pve-tmp_";
 my $adoc_source_dir = "/usr/share/pve-doc-generator";
 
 # inside pve-docs source dir?
-if (-f "attributes.txt" && -f "pve-admin-guide.adoc") {
-    $adoc_source_dir = "."
+if (-f "asciidoc-pve.in" && -f "pve-admin-guide.adoc") {
+    $adoc_source_dir = getcwd();
 }
 
 my $prepared_files = {};
@@ -341,7 +341,9 @@ sub compile_asciidoc {
        # section like footnotes, so we cannot use a2x.
        # We use xmlto instead.
 
-       my $cmd = ['asciidoc', '-dmanpage', '-bdocbook', '-a', 'docinfo1'];
+       my $cmd = ['asciidoc', '-dmanpage', '-bdocbook',
+                  '-f', "$adoc_source_dir/asciidoc/asciidoc-pve.conf",
+                  '-a', 'docinfo1'];
 
        foreach my $key (keys %$attributes) {
            my $value = $attributes->{$key};
@@ -383,17 +385,14 @@ sub compile_asciidoc {
        $attributes->{icons} = undef;
        $attributes->{'data-uri'} = undef;
 
-       my $cmd = ['asciidoc'];
+       my $cmd = ['asciidoc',
+                  '-f', "$adoc_source_dir/asciidoc/asciidoc-pve.conf",
+           ];
 
        if (($env eq 'wiki') ||
            (($env eq 'manvolnum') && ($man_target eq 'wiki'))) {
 
-           if (-f "./asciidoc/mediawiki.conf") {
-               my $cwd = getcwd();
-               push @$cmd, '-b', "$cwd/asciidoc/mediawiki";
-           } else {
-               push @$cmd, '-b', "mediawiki";
-           }
+           push @$cmd, '-b', "$adoc_source_dir/asciidoc/mediawiki";
        }
 
        foreach my $key (keys %$attributes) {

diff --git a/asciidoc/asciidoc-pve.conf b/asciidoc/asciidoc-pve.conf
new file mode 100644 (file)
index 0000000..ea4bcc8
--- /dev/null
+++ b/asciidoc/asciidoc-pve.conf
@@ -0,0 +1,17 @@
+
+[attributes]
+proxmoxGmbh=Proxmox Server Solutions Gmbh
+copyright=Proxmox Server Solutions Gmbh
+pve=Proxmox VE
+website=http://www.proxmox.com/
+forum-url=https://forum.proxmox.com/
+forum=https://forum.proxmox.com/[Proxmox VE Community Forum]
+webwiki-url=https://pve.proxmox.com/wiki/
+webwiki=https://pve.proxmox.com/wiki/[Proxmox VE Wiki]
+manmanual=Proxmox VE Documentation
+max-width=55em
+ifndef::docinfo1[]
+author=Proxmox Server Solutions Gmbh
+email=support@proxmox.com
+endif::docinfo1[]
+

diff --git a/debian/pve-doc-generator.install b/debian/pve-doc-generator.install
index 0e23a158b1c1ac1b8a9015b4f6d4e7e4ac642ad8..215985ce9d34d43f4e6deb612d6ce32aa208f369 100644 (file)
--- a/debian/pve-doc-generator.install
+++ b/debian/pve-doc-generator.install
@@ -1,3 +1,2 @@
-/etc/asciidoc/mediawiki.conf
 /usr/bin/asciidoc-pve
 /usr/share/pve-doc-generator