Prva inacica paketa za Debian wheezy distribuciju.

diff --git a/README.CARNet b/README.CARNet
index d9b2495..d38f06b 100644 (file)
--- a/README.CARNet
+++ b/README.CARNet
@@ -2,7 +2,7 @@ apache2-cn
 ~~~~~~~~~~
 
 Ovaj paket donosi CARNetovu dodatnu konfiguraciju za apache2 paket
 ~~~~~~~~~~
 
 Ovaj paket donosi CARNetovu dodatnu konfiguraciju za apache2 paket

-iz Debian squeeze distribucije.
+iz Debian wheezy distribucije.

 
 Paket dodaje VirtualHost zapise za slijedece webove:
 
 
 Paket dodaje VirtualHost zapise za slijedece webove:
 

@@ -30,5 +30,4 @@ Apache2 moduli koji su automatski ukljuceni:
   * suexec
   * CGI
 
   * suexec
   * CGI
 

-
- -- Dragan Dosen <Dragan.Dosen@CARNet.hr>  Sat, 30 Apr 2011 12:48:12 +0200
+ -- Dragan Dosen <Dragan.Dosen@CARNet.hr>  Tue, 13 Aug 2013 10:20:06 +0200

diff --git a/debian/changelog b/debian/changelog
index ee6514c..e62a5ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apache2-cn (2.2.22+1) stable; urgency=low
+
+  * Prva inacica paketa za Debian wheezy distribuciju.
+  * Azurirane datoteke debian/README.CARNet, debian/copyright,
+    debian/compat i ovisnosti unutar debian/control.
+  * Azurirani predlosci, datoteke templates/default.template i
+    templates/ssl.template.
+  * Uklonjena datoteka debian/source.lintian-overrides.
+  * debian/postrm - dodan debhelper token, dodatne izmjene.
+  * Dodana datoteka debian/source/format.
+
+ -- Dragan Dosen <Dragan.Dosen@CARNet.hr>  Tue, 13 Aug 2013 10:30:49 +0200
+

 apache2-cn (2.2+3) stable; urgency=low
 
   * Uklonjen debhelper token iz debian/postrm uz dodatne manje izmjene.
 apache2-cn (2.2+3) stable; urgency=low
 
   * Uklonjen debhelper token iz debian/postrm uz dodatne manje izmjene.

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8

diff --git a/debian/control b/debian/control
index 8b0b563..cf71a49 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,25 @@ Source: apache2-cn
 Section: httpd
 Priority: optional
 Maintainer: Dragan Dosen <Dragan.Dosen@CARNet.hr>
 Section: httpd
 Priority: optional
 Maintainer: Dragan Dosen <Dragan.Dosen@CARNet.hr>

-Build-Depends: debhelper (>= 7), po-debconf
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8.0.0), po-debconf
+Standards-Version: 3.9.3

 
 Package: apache2-cn
 Architecture: all
 
 Package: apache2-cn
 Architecture: all

-Depends: apache2-mpm-prefork (>= 2.2.16-6+squeeze1), apache2 (>= 2.2.16-6+squeeze1), apache2-suexec (>= 2.2.16-6+squeeze1), apache2 (<< 2.3), php5-cn (>= 5.3.3+1), carnet-tools-cn (>= 3.0.0), ssl-cert, procps, debconf (>= 0.5) | debconf-2.0, postfix | mail-transport-agent, ${misc:Depends}
+Depends: apache2-mpm-prefork (>= 2.2.22-13), apache2 (>= 2.2.22-13), apache2-suexec (>= 2.2.22-13), apache2 (<< 2.3), php5-cn (>= 5.3.3+1), carnet-tools-cn (>= 3.0.4), ssl-cert, procps, debconf (>= 0.5) | debconf-2.0, postfix | mail-transport-agent, ${misc:Depends}

 Suggests: mod-security-cn, apache2-doc, ca-certificates, monit-cn
 Description: Apache HTTP Server - traditional non-threaded model
  Each Apache Multi-Processing Module provides a different "flavor" of
  web server binary, compiled with a different processing model.
  .
 Suggests: mod-security-cn, apache2-doc, ca-certificates, monit-cn
 Description: Apache HTTP Server - traditional non-threaded model
  Each Apache Multi-Processing Module provides a different "flavor" of
  web server binary, compiled with a different processing model.
  .

- The prefork MPM provides a non-threaded, pre-forking implementation
- that handles requests in a manner similar to Apache 1.3. It is not as
- fast as threaded models, but is considered to be more stable. It is
- appropriate for sites that need to maintain compatibility with
- non-thread-safe libraries, and is the best MPM for isolating each
- request, so that a problem with a single request will not affect any
- other.
+ The prefork MPM provides a non-threaded implementation using a variable
+ number of processes where each process handles only one connection
+ at the same time. It is not as fast as threaded models, but is considered to
+ be more stable. It is appropriate for sites that need to maintain
+ compatibility with non-thread-safe libraries, and is the best MPM for
+ isolating each request, so that a problem with a single request will not
+ affect any other.

  .
  .

- This dummy package provided by CARNet configures a simple https enabled
+ This is a CARNet Debian package which configures a simple https enabled

  web service with PHP5.
 Homepage: http://httpd.apache.org/
  web service with PHP5.
 Homepage: http://httpd.apache.org/

diff --git a/debian/copyright b/debian/copyright
index 5350ae7..dd9254d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Copyright 2011 CARNet 
+Copyright 2013 CARNet

 
 You are free to distribute this software package under the terms of the
 GNU General Public License.
 
 You are free to distribute this software package under the terms of the
 GNU General Public License.

diff --git a/debian/postrm b/debian/postrm
index cd04f2b..5171fe3 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -17,71 +17,70 @@ sitefiles=
 
 case "$1" in
     purge)
 
 case "$1" in
     purge)

-        # Get CARNet config files in /etc/apache2/sites-available directory.
-        if [ -d "${sitesdir}" ] && [ -n "$(ls ${sitesdir}/)" ]; then
+        # continue below
+        ;;
+    *)
+        exit 0
+        ;;
+esac

 
 

-            for file in ${sitesdir}/*; do
-                if [ -f "$file" ]; then
-                    if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
-                        site=`echo "$file" | sed 's/^\/.*\///'`
-                        sitefiles="$sitefiles $site"
-                    fi
-                fi
-            done
+# Get CARNet config files in /etc/apache2/sites-available directory.
+if [ -d "${sitesdir}" ] && [ -n "$(ls ${sitesdir}/)" ]; then
+    for file in ${sitesdir}/*; do
+        if [ -f "$file" ]; then
+            if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
+                site=`echo "$file" | sed 's/^\/.*\///'`
+                sitefiles="$sitefiles $site"
+            fi

         fi
         fi

-
-        # Remove our vhosts.
-        if [ -n "$sitefiles" ]; then
-            for site in $sitefiles; do
-
-                if [ -e "$sitesdir/$site" ]; then
-
-                    cp_echo "CN: Removing $site site configuration file."
-                    rm -f $sitesdir/$site
-                fi
-            done
+    done
+fi
+
+# Remove our vhosts.
+if [ -n "$sitefiles" ]; then
+    for site in $sitefiles; do
+        if [ -e "$sitesdir/$site" ]; then
+            cp_echo "CN: Removing $site site configuration file."
+            rm -f $sitesdir/$site

         fi
         fi

-
-        # Remove default DocumentRoot if there's only a one line index.html there
-        docroots="/var/www/$HOST /var/www/www.$DOMAIN"
-
-        if [ -d "/var/www" ]; then
-
-            for docroot in $docroots; do
-
-                if [ -d $docroot ]; then
-                    if [ "x$(echo ${docroot}/*)" = "x${docroot}/index.html" ]; then
-                        if [ "$(wc -l ${docroot}/index.html | awk '{print $1}')" -eq 1 ]; then
-
-                            cp_echo "CN: Removing document root directory ${docroot}."
-                            rm -f $docroot/index.html
-                            rmdir $docroot || true
-                        fi
-                    fi
+    done
+fi
+
+# Remove default DocumentRoot if there's only a one line index.html there
+docroots="/var/www/$HOST /var/www/www.$DOMAIN"
+
+if [ -d "/var/www" ]; then
+    for docroot in $docroots; do
+        if [ -d $docroot ]; then
+            if [ "x$(echo ${docroot}/*)" = "x${docroot}/index.html" ]; then
+                if [ "$(wc -l ${docroot}/index.html | awk '{print $1}')" -eq 1 ]; then
+                    cp_echo "CN: Removing document root directory ${docroot}."
+                    rm -f $docroot/index.html
+                    rmdir $docroot || true

                 fi
                 fi

-            done
+            fi

         fi
         fi

-
-        # Remove CARNet specific configuration.
-        if [ -d "${CONFDIR}/conf.d" ] && [ -n "$(ls ${CONFDIR}/conf.d/)" ]; then
-            cp_echo "CN: Disabling CARNet specific configuration."
-            for file in ${CONFDIR}/conf.d/*; do
-                if [ -f "$file" ]; then
-                    if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
-                        rm -f $file
-                    fi
-                fi
-            done
+    done
+fi
+
+# Remove CARNet specific configuration.
+if [ -d "${CONFDIR}/conf.d" ] && [ -n "$(ls ${CONFDIR}/conf.d/)" ]; then
+    cp_echo "CN: Disabling CARNet specific configuration."
+    for file in ${CONFDIR}/conf.d/*; do
+        if [ -f "$file" ]; then
+            if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
+                rm -f $file
+            fi

         fi
         fi

+    done
+fi

 
 

-        # Debconf purge
-        db_purge
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.

 
 

-        # Mail root
-        cp_mail "apache2-cn"
-        ;;
-    *)
-        ;;
-esac
+#DEBHELPER#
+
+# Mail root
+cp_mail "apache2-cn"

 
 exit 0
 
 exit 0

diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644 (file)
index 01f24cd..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-maintainer-script-lacks-debhelper-token debian/postrm

diff --git a/debian/templates b/debian/templates
index 5135adc..bc4ef92 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -35,4 +35,3 @@ _Description: Dodati WWW VirtualHost u konfiguraciju web servera?
  Ako to NE zelite, Apache2 server ce posluzivati stranice na adresama:
  .
  http://${stroj_domena} i https://${stroj_domena}.
  Ako to NE zelite, Apache2 server ce posluzivati stranice na adresama:
  .
  http://${stroj_domena} i https://${stroj_domena}.

- 

diff --git a/templates/default.template b/templates/default.template
index cf1bd53..e31dffd 100644 (file)
--- a/templates/default.template
+++ b/templates/default.template
@@ -1,8 +1,9 @@
 <VirtualHost *:80>
     ServerAdmin webmaster@HOST.DOMAIN
 <VirtualHost *:80>
     ServerAdmin webmaster@HOST.DOMAIN

-    
+

     ServerName HOST.DOMAIN
     DocumentRoot DOCROOT
     ServerName HOST.DOMAIN
     DocumentRoot DOCROOT

+

     LogLevel warn
     ErrorLog /var/log/apache2/HOST.DOMAIN-error.log
     CustomLog /var/log/apache2/HOST.DOMAIN-access.log combined
     LogLevel warn
     ErrorLog /var/log/apache2/HOST.DOMAIN-error.log
     CustomLog /var/log/apache2/HOST.DOMAIN-access.log combined

@@ -14,5 +15,4 @@
     #    Order allow,deny
     #    Allow from all
     #</Directory>
     #    Order allow,deny
     #    Allow from all
     #</Directory>

-

 </VirtualHost>
 </VirtualHost>

diff --git a/templates/ssl.template b/templates/ssl.template
index a060692..4f53df4 100644 (file)
--- a/templates/ssl.template
+++ b/templates/ssl.template
@@ -1,12 +1,10 @@
 <IfModule mod_ssl.c>
 <IfModule mod_ssl.c>

-
-# Since SSL has no NameVirtualHosts, and we don't support machines with
-# multiple IP addresses yet, make this a simple default config.
-

 <VirtualHost _default_:443>
     ServerAdmin webmaster@HOST.DOMAIN
 <VirtualHost _default_:443>
     ServerAdmin webmaster@HOST.DOMAIN

+

     ServerName HOST.DOMAIN
     DocumentRoot DOCROOT
     ServerName HOST.DOMAIN
     DocumentRoot DOCROOT

+

     LogLevel warn
     ErrorLog /var/log/apache2/ssl-HOST.DOMAIN-error.log
     CustomLog /var/log/apache2/ssl-HOST.DOMAIN-access.log combined
     LogLevel warn
     ErrorLog /var/log/apache2/ssl-HOST.DOMAIN-error.log
     CustomLog /var/log/apache2/ssl-HOST.DOMAIN-access.log combined

@@ -23,7 +21,5 @@
     #    Order allow,deny
     #    Allow from all
     #</Directory>
     #    Order allow,deny
     #    Allow from all
     #</Directory>

-

 </VirtualHost>
 </VirtualHost>

-

 </IfModule>
 </IfModule>