From: Dragan Dosen <Dragan.Dosen@CARNet.hr>
Date: Thu, 15 Aug 2013 18:10:59 +0000 (+0200)
Subject: Umjesto sureserverEDU.pem koristi se naziv cert-chain.pem.
X-Git-Tag: v2.2.22+1~1
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=d9f8f17762679af717c189b889d7768cbbefbf3e;p=apache2-cn.git

Umjesto sureserverEDU.pem koristi se naziv cert-chain.pem.
---

diff --git a/debian/changelog b/debian/changelog
index b6a42e1..55bf11d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ apache2-cn (2.2.22+1) stable; urgency=low
   * Dodana datoteka debian/source/format.
   * Datoteke carnet-generate-ssl, templates/openssl.cnf - povecana
     velicina generiranog kljuca na 2048 bit, manje izmjene.
+  * debian/postinst, debian/templates, templates/ssl.template -
+    umjesto sureserverEDU.pem koristi se naziv cert-chain.pem.
 
  -- Dragan Dosen <Dragan.Dosen@CARNet.hr>  Tue, 13 Aug 2013 10:30:49 +0200
 
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index db7803c..cf7bd8c 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: apache2-cn\n"
 "Report-Msgid-Bugs-To: apache2-cn@packages.debian.org\n"
-"POT-Creation-Date: 2011-04-29 18:17+0200\n"
+"POT-Creation-Date: 2013-08-15 20:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,7 +74,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../templates:3001
-msgid "Primjer: /etc/ssl/certs/sureserverEDU.pem"
+msgid "Primjer: /etc/ssl/certs/cert-chain.pem"
 msgstr ""
 
 #. Type: boolean
diff --git a/debian/postinst b/debian/postinst
index 9832c94..fffc063 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -521,8 +521,8 @@ if [ $apache2_sslcert -eq 0 ]; then
 
         # SSLCertificateChainFile
         if [ -n "$apache2_sslccf" ]; then
-            cp_check_and_sed "^# SSLCertificateChainFile \/etc\/ssl\/certs/sureserverEDU\.pem" \
-                "s#\# SSLCertificateChainFile /etc/ssl/certs/sureserverEDU.pem#SSLCertificateChainFile $apache2_sslccf #g" \
+            cp_check_and_sed "^# SSLCertificateChainFile \/etc\/ssl\/certs/cert-chain\.pem" \
+                "s#\# SSLCertificateChainFile /etc/ssl/certs/cert-chain.pem#SSLCertificateChainFile $apache2_sslccf #g" \
             $SSLTMP || true
         fi
 
diff --git a/debian/templates b/debian/templates
index bc4ef92..3a0b3cd 100644
--- a/debian/templates
+++ b/debian/templates
@@ -21,7 +21,7 @@ _Description: SSL Certificate Chain:
  Upisite lokaciju vec postojece SSL chain datoteke. U slucaju da nemate
  SSL chain datoteku, ostavite ovo polje praznim.
  .
- Primjer: /etc/ssl/certs/sureserverEDU.pem
+ Primjer: /etc/ssl/certs/cert-chain.pem
 
 Template: apache2-cn/wwwhost
 Type: boolean
diff --git a/templates/ssl.template b/templates/ssl.template
index 4f53df4..8e39bae 100644
--- a/templates/ssl.template
+++ b/templates/ssl.template
@@ -12,7 +12,7 @@
     SSLEngine on
     SSLCertificateFile    /etc/ssl/certs/apache2.pem
     SSLCertificateKeyFile /etc/ssl/private/apache2.key
-    # SSLCertificateChainFile /etc/ssl/certs/sureserverEDU.pem
+    # SSLCertificateChainFile /etc/ssl/certs/cert-chain.pem
 
     #<Directory DOCROOT>
     #    # AllowOverride All