- upgrade|abort-upgrade)
+ upgrade)
+ # If this is an upgrade, then they might have the UFW profile in the wrong spot.
+ if [ -d /etc/ufw/applications.d/nginx ]; then
+ rm -f /etc/ufw/applications.d/nginx/ufw.profile
+ rmdir /etc/ufw/applications.d/nginx
+ fi
;;
[Cyril Lavier]
Index: ufw.profile
===================================================================
--- ufw.profile (revision 19547)
+++ ufw.profile (working copy)
@@ -1,14 +0,0 @@
-[Nginx HTTP]
-title=Web Server (Nginx, HTTP)
-description=Small, but very powerful and efficient web server
-ports=80/tcp
-
-[Nginx HTTPS]
-title=Web Server (Nginx, HTTPS)
-description=Small, but very powerful and efficient web server
-ports=443/tcp
-
-[Nginx Full]
-title=Web Server (Nginx, HTTP + HTTPS)
-description=Small, but very powerful and efficient web server
-ports=80,443/tcp
Index: nginx-common.install
===================================================================
--- nginx-common.install (revision 19547)
+++ nginx-common.install (working copy)
@@ -1,3 +1,3 @@
debian/conf/* etc/nginx
-debian/ufw.profile etc/ufw/applications.d/nginx
+debian/ufw/nginx etc/ufw/applications.d
html/* usr/share/nginx/www/
This has been fixed in the latest commit in Debian.
Index: nginx-common. preinst ======= ======= ======= ======= ======= ======= ======= ======= ==== preinst (revision 19547) preinst (working copy) d/nginx- common
=======
--- nginx-common.
+++ nginx-common.
@@ -11,9 +11,17 @@
rm -f /etc/logrotate.
;;
- upgrade| abort-upgrade) applications. d/nginx ]; then applications. d/nginx/ ufw.profile applications. d/nginx
+ upgrade)
+ # If this is an upgrade, then they might have the UFW profile in the wrong spot.
+ if [ -d /etc/ufw/
+ rm -f /etc/ufw/
+ rmdir /etc/ufw/
+ fi
;;
+ abort-upgrade) ======= ======= ======= ======= ======= ======= ======= ======= ==== nginx-common. install: nginx-common. preinst:
+ ;;
+
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
Index: changelog
=======
--- changelog (revision 19547)
+++ changelog (working copy)
@@ -1,3 +1,13 @@
+nginx (1.1.8-1ubuntu1) precise; urgency=low
+
+ * debian/
+ + Changed ufw profile installation (LP: #825349)
+ - debian/ufw.profile -> debian/ufw/nginx
+ * debian/
+ + Cleanup of moved nginx profile.
+
+ -- Michael Lustfield <email address hidden> Tue, 15 Nov 2011 01:51:17 +0000
+
nginx (1.1.8-1) UNRELEASED; urgency=low
[Cyril Lavier] ======= ======= ======= ======= ======= ======= ======= ======= ==== install ======= ======= ======= ======= ======= ======= ======= ======= ==== install (revision 19547) install (working copy) applications. d/nginx applications. d nginx/www/
Index: ufw.profile
=======
--- ufw.profile (revision 19547)
+++ ufw.profile (working copy)
@@ -1,14 +0,0 @@
-[Nginx HTTP]
-title=Web Server (Nginx, HTTP)
-description=Small, but very powerful and efficient web server
-ports=80/tcp
-
-[Nginx HTTPS]
-title=Web Server (Nginx, HTTPS)
-description=Small, but very powerful and efficient web server
-ports=443/tcp
-
-[Nginx Full]
-title=Web Server (Nginx, HTTP + HTTPS)
-description=Small, but very powerful and efficient web server
-ports=80,443/tcp
Index: nginx-common.
=======
--- nginx-common.
+++ nginx-common.
@@ -1,3 +1,3 @@
debian/conf/* etc/nginx
-debian/ufw.profile etc/ufw/
+debian/ufw/nginx etc/ufw/
html/* usr/share/
Sending debian/changelog nginx-common. install nginx-common. preinst
Sending debian/
Sending debian/
Adding debian/ufw
Adding debian/ufw/nginx
Deleting debian/ufw.profile
If I have time, I'll see about creating a debdiff for the ubuntu guys to check out. Otherwise, you can feel free to do it. :)