From d6a59a34a74047c77a954b7f78d8ec2a159f279d Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: May 26 2019 22:51:42 +0000 Subject: Use Apache content negotiation in centos-noindex - Previously, both centos-indexhtml and centos-noindex were using the same file structure, which involves a javascript redirection in order to show localized content. However, doing so for Apache HTTP test page is an unnecessary burden if you want to preserve the behaviour of showing the test page in the main domain (without any further slashes in the URL or visible redirections) when no index.html is at /var/www/html/ directory. So, centos-noindex changed the layout to use Apache content negotiation instead, based on the languages we are providing localization for. To implement this, the welcome.conf file in httpd package should look like the following: Options -Indexes ErrorDocument 403 /noindex/index.html Alias /noindex /usr/share/httpd/noindex Options MultiViews DirectoryIndex index.html AddLanguage en-US .en-US AddLanguage es-ES .es-ES AddLanguage zh-CN .zh-CN AddLanguage zh-HK .zh-HK AddLanguage zh-TW .zh-TW LanguagePriority en-US ForceLanguagePriority Fallback AllowOverride None Require all granted - centos-*/Makefiles were updated to reflect centos-noindex structural changes. - Localization actions were moved from html/centos-*/Makefile to html/Makefile. --- diff --git a/.gitignore b/.gitignore index bb06648..69fba87 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ */*.tar.gz # # Exclude locale-specific directories. -*/centos-*/??-?? +*/centos-*/centos-* diff --git a/html/Makefile b/html/Makefile index 76a1ae3..c1e55da 100644 --- a/html/Makefile +++ b/html/Makefile @@ -1,6 +1,6 @@ ############################################################################### # -# The CentOS HTML Makefile +# The CentOS HTML files # Copyright (C) 2019 Alain Reguera Delgado # # This program is free software: you can redistribute it and/or modify it @@ -21,43 +21,19 @@ #============================================================================== # Configuration #============================================================================== -package = centos-indexhtml -version = 8.0 lang = en-US localedir = PO -prefix = . #============================================================================== # Requirements #============================================================================== -all: $(package)/$(lang)/index.html +all: -build: $(prefix)/$(package)-$(version).tar.gz +po: $(localedir)/$(lang).po #============================================================================== # Sources #============================================================================== -$(prefix)/$(package)-$(version).tar.gz: \ - $(package)/??-??/* \ - $(package)/index.tpl.html \ - $(package)/index.html \ - $(localedir)/*.po \ - common/css/* \ - common/images/* \ - common/fonts/* - rm -r $(package)-$(version) || mkdir $(package)-$(version) - cp -a $(package)/??-?? $(package)-$(version) - cp -a $(package)/index.html $(package)-$(version) - cp -a common $(package)-$(version) - if [[ $(package) == centos-indexhtml ]];then \ - rm -v $(package)-$(version)/common/images/pb-*.png; \ - fi - tar -czf $(prefix)/$(package)-$(version).tar.gz $(package)-$(version) - rm -r $(package)-$(version) - -#====================================================================== -# Localization -#====================================================================== $(localedir)/$(lang).pot: centos-*/index.tpl.html xml2po -l $(lang) -o /tmp/$(lang).pot centos-*/index.tpl.html if [[ ! -f $(localedir)/$(lang).pot ]];then \ @@ -72,14 +48,3 @@ $(localedir)/$(lang).po: $(localedir)/$(lang).pot else \ msgmerge -U $(localedir)/$(lang).po $(localedir)/$(lang).pot; \ fi - -#====================================================================== -# Content -#====================================================================== -$(package)/$(lang): - mkdir -p $(package)/$(lang) - -$(package)/$(lang)/index.html: $(package)/$(lang) $(localedir)/$(lang).po $(package)/index.tpl.html - xmllint -noout $(package)/index.tpl.html - xml2po -l $(lang) -p $(localedir)/$(lang).po -o $(package)/$(lang)/index.html $(package)/index.tpl.html - sed -i 's///' $(package)/$(lang)/index.html diff --git a/html/PO/en-US.po b/html/PO/en-US.po index 9754e94..e9b69c6 100644 --- a/html/PO/en-US.po +++ b/html/PO/en-US.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: v 0.2\n" -"POT-Creation-Date: 2019-05-19 21:49-0300\n" +"POT-Creation-Date: 2019-05-26 15:57-0300\n" "PO-Revision-Date: 2019-05-19 08:42-0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -31,7 +31,7 @@ msgstr "" msgid "Apache HTTP server" msgstr "Apache HTTP server" -#: centos-noindex/index.tpl.html:25(a) +#: centos-noindex/index.tpl.html:25(a) centos-indexhtml/index.tpl.html:27(a) msgid "CentOS" msgstr "CentOS" @@ -177,106 +177,121 @@ msgstr "" "a rich platform for open source communities to build upon. For more " "information please visit the ." -#: centos-noindex/index.tpl.html:67(a) +#: centos-noindex/index.tpl.html:67(a) centos-indexhtml/index.tpl.html:33(a) msgid "Legal" msgstr "Legal" -#: centos-noindex/index.tpl.html:67(a) +#: centos-noindex/index.tpl.html:67(a) centos-indexhtml/index.tpl.html:33(a) msgid "Privacy" msgstr "Privacy" -#: centos-noindex/index.tpl.html:67(p) +#: centos-noindex/index.tpl.html:67(p) centos-indexhtml/index.tpl.html:33(p) msgid "© 2019 The CentOS Project | | " msgstr "© 2019 The CentOS Project | | " +#: centos-indexhtml/index.tpl.html:4(title) +#: centos-indexhtml/index.tpl.html:24(h1) +msgid "Welcome to CentOS" +msgstr "Welcome to CentOS" + +#: centos-indexhtml/index.tpl.html:17(span) +msgid "CentOS Linux 8" +msgstr "CentOS Linux 8" + +#: centos-indexhtml/index.tpl.html:25(h2) +msgid "The Community ENTerprise Operating System" +msgstr "The Community ENTerprise Operating System" + +#: centos-indexhtml/index.tpl.html:27(p) +msgid "" +" Linux is an enterprise-class Linux distribution derived " +"from sources freely provided to the public by Red Hat, Inc. for Red Hat " +"Enterprise Linux. CentOS conforms fully with the upstream vendors " +"redistribution policy and aims to be functionally compatible. (CentOS mainly " +"changes packages to remove upstream vendor branding and artwork.)" +msgstr "" +" Linux is an enterprise-class Linux distribution derived " +"from sources freely provided to the public by Red Hat, Inc. for Red Hat " +"Enterprise Linux. CentOS conforms fully with the upstream vendors " +"redistribution policy and aims to be functionally compatible. (CentOS mainly " +"changes packages to remove upstream vendor branding and artwork.)" + +#: centos-indexhtml/index.tpl.html:28(p) +msgid "" +"CentOS Linux is developed by a small but growing team of core developers. In " +"turn the core developers are supported by an active user community including " +"system administrators, network administrators, enterprise users, managers, " +"core Linux contributors and Linux enthusiasts from around the world." +msgstr "" +"CentOS Linux is developed by a small but growing team of core developers. In " +"turn the core developers are supported by an active user community including " +"system administrators, network administrators, enterprise users, managers, " +"core Linux contributors and Linux enthusiasts from around the world." + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "mirror network" +msgstr "mirror network" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "SIGs" +msgstr "SIGs" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "wiki" +msgstr "wiki" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "IRC Chat" +msgstr "IRC Chat" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Email Lists" +msgstr "Email Lists" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Forums" +msgstr "Forums" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Calendar & IRC Meeting List" +msgstr "Calendar & IRC Meeting List" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Planet" +msgstr "Planet" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Bugs Database" +msgstr "Bugs Database" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "FAQ" +msgstr "FAQ" + +#: centos-indexhtml/index.tpl.html:29(p) +msgid "" +"CentOS Linux has numerous advantages including: an active and growing user " +"community, quickly rebuilt, tested, and QA'ed errata packages, an extensive " +", developers who are contactable and responsive, Special " +"Interest Groups () to add functionality to the core CentOS " +"distribution, and multiple community support avenues including a " +", , , , " +", , , and an ." +msgstr "" +"CentOS Linux has numerous advantages including: an active and growing user " +"community, quickly rebuilt, tested, and QA'ed errata packages, an extensive " +", developers who are contactable and responsive, Special " +"Interest Groups () to add functionality to the core CentOS " +"distribution, and multiple community support avenues including a " +", , , , " +", , , and an ." + #. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: centos-noindex/index.tpl.html:0(None) +#: centos-indexhtml/index.tpl.html:0(None) msgid "translator-credits" msgstr "translator-credits" -#~ msgid "Welcome to CentOS" -#~ msgstr "Welcome to CentOS" - -#~ msgid "CentOS Linux 8" -#~ msgstr "CentOS Linux 8" - -#~ msgid "The Community ENTerprise Operating System" -#~ msgstr "The Community ENTerprise Operating System" - -#~ msgid "" -#~ " Linux is an enterprise-class Linux distribution derived " -#~ "from sources freely provided to the public by Red Hat, Inc. for Red Hat " -#~ "Enterprise Linux. CentOS conforms fully with the upstream vendors " -#~ "redistribution policy and aims to be functionally compatible. (CentOS " -#~ "mainly changes packages to remove upstream vendor branding and artwork.)" -#~ msgstr "" -#~ " Linux is an enterprise-class Linux distribution derived " -#~ "from sources freely provided to the public by Red Hat, Inc. for Red Hat " -#~ "Enterprise Linux. CentOS conforms fully with the upstream vendors " -#~ "redistribution policy and aims to be functionally compatible. (CentOS " -#~ "mainly changes packages to remove upstream vendor branding and artwork.)" - -#~ msgid "" -#~ "CentOS Linux is developed by a small but growing team of core developers. " -#~ "In turn the core developers are supported by an active user community " -#~ "including system administrators, network administrators, enterprise " -#~ "users, managers, core Linux contributors and Linux enthusiasts from " -#~ "around the world." -#~ msgstr "" -#~ "CentOS Linux is developed by a small but growing team of core developers. " -#~ "In turn the core developers are supported by an active user community " -#~ "including system administrators, network administrators, enterprise " -#~ "users, managers, core Linux contributors and Linux enthusiasts from " -#~ "around the world." - -#~ msgid "mirror network" -#~ msgstr "mirror network" - -#~ msgid "SIGs" -#~ msgstr "SIGs" - -#~ msgid "wiki" -#~ msgstr "wiki" - -#~ msgid "IRC Chat" -#~ msgstr "IRC Chat" - -#~ msgid "Email Lists" -#~ msgstr "Email Lists" - -#~ msgid "Forums" -#~ msgstr "Forums" - -#~ msgid "Calendar & IRC Meeting List" -#~ msgstr "Calendar & IRC Meeting List" - -#~ msgid "Planet" -#~ msgstr "Planet" - -#~ msgid "Bugs Database" -#~ msgstr "Bugs Database" - -#~ msgid "FAQ" -#~ msgstr "FAQ" - -#~ msgid "" -#~ "CentOS Linux has numerous advantages including: an active and growing " -#~ "user community, quickly rebuilt, tested, and QA'ed errata packages, an " -#~ "extensive , developers who are contactable and " -#~ "responsive, Special Interest Groups () to add " -#~ "functionality to the core CentOS distribution, and multiple community " -#~ "support avenues including a , , " -#~ ", , , , " -#~ ", and an ." -#~ msgstr "" -#~ "CentOS Linux has numerous advantages including: an active and growing " -#~ "user community, quickly rebuilt, tested, and QA'ed errata packages, an " -#~ "extensive , developers who are contactable and " -#~ "responsive, Special Interest Groups () to add " -#~ "functionality to the core CentOS distribution, and multiple community " -#~ "support avenues including a , , " -#~ ", , , , " -#~ ", and an ." - #~ msgid " Test Page" #~ msgstr " Test Page" diff --git a/html/PO/en-US.pot b/html/PO/en-US.pot index c69cadd..e421523 100644 --- a/html/PO/en-US.pot +++ b/html/PO/en-US.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: v 0.2\n" -"POT-Creation-Date: 2019-05-19 21:49-0300\n" +"POT-Creation-Date: 2019-05-26 15:57-0300\n" "PO-Revision-Date: 2019-05-19 08:42-0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -31,7 +31,7 @@ msgstr "" msgid "Apache HTTP server" msgstr "Apache HTTP server" -#: centos-noindex/index.tpl.html:25(a) +#: centos-noindex/index.tpl.html:25(a) centos-indexhtml/index.tpl.html:27(a) msgid "CentOS" msgstr "CentOS" @@ -177,106 +177,121 @@ msgstr "" "a rich platform for open source communities to build upon. For more " "information please visit the ." -#: centos-noindex/index.tpl.html:67(a) +#: centos-noindex/index.tpl.html:67(a) centos-indexhtml/index.tpl.html:33(a) msgid "Legal" msgstr "Legal" -#: centos-noindex/index.tpl.html:67(a) +#: centos-noindex/index.tpl.html:67(a) centos-indexhtml/index.tpl.html:33(a) msgid "Privacy" msgstr "Privacy" -#: centos-noindex/index.tpl.html:67(p) +#: centos-noindex/index.tpl.html:67(p) centos-indexhtml/index.tpl.html:33(p) msgid "© 2019 The CentOS Project | | " msgstr "© 2019 The CentOS Project | | " +#: centos-indexhtml/index.tpl.html:4(title) +#: centos-indexhtml/index.tpl.html:24(h1) +msgid "Welcome to CentOS" +msgstr "Welcome to CentOS" + +#: centos-indexhtml/index.tpl.html:17(span) +msgid "CentOS Linux 8" +msgstr "CentOS Linux 8" + +#: centos-indexhtml/index.tpl.html:25(h2) +msgid "The Community ENTerprise Operating System" +msgstr "The Community ENTerprise Operating System" + +#: centos-indexhtml/index.tpl.html:27(p) +msgid "" +" Linux is an enterprise-class Linux distribution derived " +"from sources freely provided to the public by Red Hat, Inc. for Red Hat " +"Enterprise Linux. CentOS conforms fully with the upstream vendors " +"redistribution policy and aims to be functionally compatible. (CentOS mainly " +"changes packages to remove upstream vendor branding and artwork.)" +msgstr "" +" Linux is an enterprise-class Linux distribution derived " +"from sources freely provided to the public by Red Hat, Inc. for Red Hat " +"Enterprise Linux. CentOS conforms fully with the upstream vendors " +"redistribution policy and aims to be functionally compatible. (CentOS mainly " +"changes packages to remove upstream vendor branding and artwork.)" + +#: centos-indexhtml/index.tpl.html:28(p) +msgid "" +"CentOS Linux is developed by a small but growing team of core developers. In " +"turn the core developers are supported by an active user community including " +"system administrators, network administrators, enterprise users, managers, " +"core Linux contributors and Linux enthusiasts from around the world." +msgstr "" +"CentOS Linux is developed by a small but growing team of core developers. In " +"turn the core developers are supported by an active user community including " +"system administrators, network administrators, enterprise users, managers, " +"core Linux contributors and Linux enthusiasts from around the world." + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "mirror network" +msgstr "mirror network" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "SIGs" +msgstr "SIGs" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "wiki" +msgstr "wiki" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "IRC Chat" +msgstr "IRC Chat" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Email Lists" +msgstr "Email Lists" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Forums" +msgstr "Forums" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Calendar & IRC Meeting List" +msgstr "Calendar & IRC Meeting List" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Planet" +msgstr "Planet" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "Bugs Database" +msgstr "Bugs Database" + +#: centos-indexhtml/index.tpl.html:29(a) +msgid "FAQ" +msgstr "FAQ" + +#: centos-indexhtml/index.tpl.html:29(p) +msgid "" +"CentOS Linux has numerous advantages including: an active and growing user " +"community, quickly rebuilt, tested, and QA'ed errata packages, an extensive " +", developers who are contactable and responsive, Special " +"Interest Groups () to add functionality to the core CentOS " +"distribution, and multiple community support avenues including a " +", , , , " +", , , and an ." +msgstr "" +"CentOS Linux has numerous advantages including: an active and growing user " +"community, quickly rebuilt, tested, and QA'ed errata packages, an extensive " +", developers who are contactable and responsive, Special " +"Interest Groups () to add functionality to the core CentOS " +"distribution, and multiple community support avenues including a " +", , , , " +", , , and an ." + #. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: centos-noindex/index.tpl.html:0(None) +#: centos-indexhtml/index.tpl.html:0(None) msgid "translator-credits" msgstr "translator-credits" -#~ msgid "Welcome to CentOS" -#~ msgstr "Welcome to CentOS" - -#~ msgid "CentOS Linux 8" -#~ msgstr "CentOS Linux 8" - -#~ msgid "The Community ENTerprise Operating System" -#~ msgstr "The Community ENTerprise Operating System" - -#~ msgid "" -#~ " Linux is an enterprise-class Linux distribution derived " -#~ "from sources freely provided to the public by Red Hat, Inc. for Red Hat " -#~ "Enterprise Linux. CentOS conforms fully with the upstream vendors " -#~ "redistribution policy and aims to be functionally compatible. (CentOS " -#~ "mainly changes packages to remove upstream vendor branding and artwork.)" -#~ msgstr "" -#~ " Linux is an enterprise-class Linux distribution derived " -#~ "from sources freely provided to the public by Red Hat, Inc. for Red Hat " -#~ "Enterprise Linux. CentOS conforms fully with the upstream vendors " -#~ "redistribution policy and aims to be functionally compatible. (CentOS " -#~ "mainly changes packages to remove upstream vendor branding and artwork.)" - -#~ msgid "" -#~ "CentOS Linux is developed by a small but growing team of core developers. " -#~ "In turn the core developers are supported by an active user community " -#~ "including system administrators, network administrators, enterprise " -#~ "users, managers, core Linux contributors and Linux enthusiasts from " -#~ "around the world." -#~ msgstr "" -#~ "CentOS Linux is developed by a small but growing team of core developers. " -#~ "In turn the core developers are supported by an active user community " -#~ "including system administrators, network administrators, enterprise " -#~ "users, managers, core Linux contributors and Linux enthusiasts from " -#~ "around the world." - -#~ msgid "mirror network" -#~ msgstr "mirror network" - -#~ msgid "SIGs" -#~ msgstr "SIGs" - -#~ msgid "wiki" -#~ msgstr "wiki" - -#~ msgid "IRC Chat" -#~ msgstr "IRC Chat" - -#~ msgid "Email Lists" -#~ msgstr "Email Lists" - -#~ msgid "Forums" -#~ msgstr "Forums" - -#~ msgid "Calendar & IRC Meeting List" -#~ msgstr "Calendar & IRC Meeting List" - -#~ msgid "Planet" -#~ msgstr "Planet" - -#~ msgid "Bugs Database" -#~ msgstr "Bugs Database" - -#~ msgid "FAQ" -#~ msgstr "FAQ" - -#~ msgid "" -#~ "CentOS Linux has numerous advantages including: an active and growing " -#~ "user community, quickly rebuilt, tested, and QA'ed errata packages, an " -#~ "extensive , developers who are contactable and " -#~ "responsive, Special Interest Groups () to add " -#~ "functionality to the core CentOS distribution, and multiple community " -#~ "support avenues including a , , " -#~ ", , , , " -#~ ", and an ." -#~ msgstr "" -#~ "CentOS Linux has numerous advantages including: an active and growing " -#~ "user community, quickly rebuilt, tested, and QA'ed errata packages, an " -#~ "extensive , developers who are contactable and " -#~ "responsive, Special Interest Groups () to add " -#~ "functionality to the core CentOS distribution, and multiple community " -#~ "support avenues including a , , " -#~ ", , , , " -#~ ", and an ." - #~ msgid " Test Page" #~ msgstr " Test Page" diff --git a/html/centos-indexhtml/Makefile b/html/centos-indexhtml/Makefile new file mode 100644 index 0000000..c5b2ad1 --- /dev/null +++ b/html/centos-indexhtml/Makefile @@ -0,0 +1,62 @@ +############################################################################### +# +# centos-indexhtml - the CentOS web browser's default page +# Copyright (C) 2019 Alain Reguera Delgado +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# this program. If not, see . +# +############################################################################### + +#============================================================================== +# Configuration +#============================================================================== +lang = en-US +prefix = . +version = 8.0 +package = centos-indexhtml-$(version) +localedir = ../PO + +#============================================================================== +# Requirements +#============================================================================== +all: $(package)/$(lang)/index.html + +build: $(prefix)/$(package).tar.gz + +#============================================================================== +# Sources +#============================================================================== +$(package): + mkdir -p $(package) + +$(package)/$(lang): + mkdir -p $(package)/$(lang) + +$(prefix)/$(package).tar.gz: \ + $(package) \ + $(package)/??-??/* \ + index.tpl.html \ + index.html \ + $(localedir)/*.po \ + ../common/css/* \ + ../common/images/* \ + ../common/fonts/* + cp -a index.html $(package) + rsync -a --exclude="images/pb-*.png" ../common $(package) + tar -czf $(prefix)/$(package).tar.gz $(package) + +$(package)/$(lang)/index.html: $(package)/$(lang) $(localedir)/$(lang).po index.tpl.html + xmllint -noout index.tpl.html + xml2po -l $(lang) -p $(localedir)/$(lang).po -o $(package)/$(lang)/index.html index.tpl.html + sed -i 's///' $(package)/$(lang)/index.html diff --git a/html/centos-noindex/Makefile b/html/centos-noindex/Makefile new file mode 100644 index 0000000..151567a --- /dev/null +++ b/html/centos-noindex/Makefile @@ -0,0 +1,57 @@ +############################################################################### +# +# centos-noindex - the CentOS test page for Apache HTTP server +# Copyright (C) 2019 Alain Reguera Delgado +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# this program. If not, see . +# +############################################################################### + +#============================================================================== +# Configuration +#============================================================================== +lang = en-US +prefix = . +version = 8.0 +package = centos-noindex-$(version) +localedir = ../PO + +#============================================================================== +# Requirements +#============================================================================== +all: $(package)/index.html.$(lang) + +build: $(prefix)/$(package).tar.gz + +#============================================================================== +# Sources +#============================================================================== +$(package): + mkdir -p $(package) + +$(prefix)/$(package).tar.gz: \ + $(package) \ + $(package)/index.html.??-?? \ + index.tpl.html \ + $(localedir)/*.po \ + ../common/css/* \ + ../common/images/* \ + ../common/fonts/* + rsync -a ../common $(package) + tar -czf $(prefix)/$(package).tar.gz $(package) + +$(package)/index.html.$(lang): $(package) $(localedir)/$(lang).po index.tpl.html + xmllint -noout index.tpl.html + xml2po -l $(lang) -p $(localedir)/$(lang).po -o $(package)/index.html.$(lang) index.tpl.html + sed -i 's///' $(package)/index.html.$(lang) diff --git a/html/centos-noindex/index.html b/html/centos-noindex/index.html deleted file mode 100644 index f29ff47..0000000 --- a/html/centos-noindex/index.html +++ /dev/null @@ -1,47 +0,0 @@ - - - -Apache HTTP Server Test Page powered by CentOS - - - - diff --git a/html/centos-noindex/index.tpl.html b/html/centos-noindex/index.tpl.html index b555c72..e96fc6c 100644 --- a/html/centos-noindex/index.tpl.html +++ b/html/centos-noindex/index.tpl.html @@ -5,8 +5,8 @@ - - + +
@@ -46,10 +46,10 @@

You are free to use the images below on Apache and CentOS Linux powered HTTP servers. Thanks for using Apache and CentOS!

- [ Powered by Apache ] + [ Powered by Apache ] - [ Powered by CentOS Linux ] + [ Powered by CentOS Linux ]