[ciderwebmail] 13/33: Install uWSGI and Apache snippets below /etc (not as example files).

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository ciderwebmail.

commit a71ac9a28fcfdc5bc436c84f7f4dec803f3a1a70
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 16 15:35:17 2013 +0100

    Install uWSGI and Apache snippets below /etc (not as example files).
---
 debian/etc/ciderwebmail/apache2-uwsgi.conf                   |  4 ++++
 debian/etc/{ => ciderwebmail}/ciderwebmail.conf              |  0
 debian/etc/{ => ciderwebmail}/ciderwebmail.psgi              |  0
 debian/{uwsgi => }/etc/uwsgi/apps-available/ciderwebmail.ini |  0
 debian/rules                                                 |  2 +-
 debian/uwsgi/README                                          | 11 -----------
 debian/uwsgi/etc/apache2/conf.d/ciderwebmail                 |  4 ----
 7 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/debian/etc/ciderwebmail/apache2-uwsgi.conf b/debian/etc/ciderwebmail/apache2-uwsgi.conf
new file mode 100644
index 0000000..2b70fa7
--- /dev/null
+++ b/debian/etc/ciderwebmail/apache2-uwsgi.conf
@@ -0,0 +1,4 @@
+<Location /cider>
+	SetHandler uwsgi-handler
+	uWSGISocket /run/uwsgi/app/ciderwebmail/socket
+</Location>
diff --git a/debian/etc/ciderwebmail.conf b/debian/etc/ciderwebmail/ciderwebmail.conf
similarity index 100%
rename from debian/etc/ciderwebmail.conf
rename to debian/etc/ciderwebmail/ciderwebmail.conf
diff --git a/debian/etc/ciderwebmail.psgi b/debian/etc/ciderwebmail/ciderwebmail.psgi
similarity index 100%
rename from debian/etc/ciderwebmail.psgi
rename to debian/etc/ciderwebmail/ciderwebmail.psgi
diff --git a/debian/uwsgi/etc/uwsgi/apps-available/ciderwebmail.ini b/debian/etc/uwsgi/apps-available/ciderwebmail.ini
similarity index 100%
rename from debian/uwsgi/etc/uwsgi/apps-available/ciderwebmail.ini
rename to debian/etc/uwsgi/apps-available/ciderwebmail.ini
diff --git a/debian/rules b/debian/rules
index 7b07d83..1135700 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,7 @@ CDBS_SUGGESTS_$(pkg) = $(suggests)
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(root/static/(images/.*|favicon\.ico)|debian/(changelog|copyright(|_hints|_newhints)))$
 
 DEB_DH_INSTALL_ARGS_$(pkg) = root/* usr/share/$(pkg)/root/
-DEB_INSTALL_EXAMPLES_$(pkg) = ciderwebmail.yml script/update_schema.sh debian/uwsgi
+DEB_INSTALL_EXAMPLES_$(pkg) = ciderwebmail.yml script/update_schema.sh
 
 # Avoid virtually empty TODO file
 DEB_INSTALL_DOCS_ALL := $(filter-out TODO,$(DEB_INSTALL_DOCS_ALL))
diff --git a/debian/uwsgi/README b/debian/uwsgi/README
deleted file mode 100644
index aff3778..0000000
--- a/debian/uwsgi/README
+++ /dev/null
@@ -1,11 +0,0 @@
-CiderWebmail with uWSGI and Apache2
-===================================
-
-uWSGI started as a Python WSGI but nowadays supports Perl PSGI as well.
-
-Copy the files into /etc and invoke these commands as root:
-
-    aptitude install uwsgi uwsgi-plugin-psgi libapache2-mod-uwsgi
-    service uwsgi start ciderwebmail
-
- -- Jonas Smedegaard <dr at jones.dk>  Sun, 10 Jun 2012 19:31:13 +0200
diff --git a/debian/uwsgi/etc/apache2/conf.d/ciderwebmail b/debian/uwsgi/etc/apache2/conf.d/ciderwebmail
deleted file mode 100644
index 8d434bd..0000000
--- a/debian/uwsgi/etc/apache2/conf.d/ciderwebmail
+++ /dev/null
@@ -1,4 +0,0 @@
-<Location /ciderwebmail>
-	SetHandler uwsgi-handler
-	uWSGISocket /run/uwsgi/app/webmail/socket
-</Location>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ciderwebmail.git