Moved mailpile apache install directories

mailpile · Dec 30, 2015 · 66e93a9 · 66e93a9
1 parent 5406110
commit 66e93a9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/mailpile/www/default/html/page/multipile/index.html b/mailpile/www/default/html/page/multipile/index.html
@@ -25,7 +25,7 @@
 
 <div id="login-details" class="animated">
   <div class="form-text">{{_("Launch Mailpile as ...")}}</div>
-  <form method="POST" action='admin.cgi'
+  <form method="POST" action='/cgi-bin/mailpile/admin.cgi'
         id="form-login" class="clearfix animated">
    <div class='form-login'>
     <input id="login-username" type="text" name="username"

diff --git a/packages/apache/mailpile.conf b/packages/apache/mailpile.conf
@@ -1,15 +1,19 @@
 #
 # This is the Mailpile multi-user Apache config
 #
+Alias "/mailpile/shared/" "/usr/share/mailpile/default/"
 Alias "/mailpile" "/var/lib/mailpile/apache/"
 RewriteEngine On
 
 <Directory "/var/lib/mailpile/apache/">
     AllowOverride All
-    Options FollowSymLinks ExecCGI
-    AddHandler cgi-script .cgi
     LogLevel alert rewrite:trace8
     Require all granted
 </Directory>
 
-
+<Directory "/usr/share/mailpile/">
+    AllowOverride All
+    Options FollowSymLinks
+    LogLevel alert rewrite:trace8
+    Require all granted
+</Directory>
diff --git a/packages/apache/www/index.html b/packages/apache/www/index.html
@@ -10,7 +10,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <link rel="stylesheet" href="/mailpile/shared/css/default.css?ts=0.4.5" />
-  
+
   <!-- Apple Icons -->
   <link rel="apple-touch-icon" sizes="57x57" href="/mailpile/shared/img/apple-touch-icon.png" />
   <link rel="apple-touch-icon" sizes="72x72" href="/mailpile/shared/img/apple-touch-icon-72x72.png" />
@@ -66,7 +66,7 @@
 
 <div id="login-details" class="animated">
   <div class="form-text">Launch Mailpile as ...</div>
-  <form method="POST" action='admin.cgi'
+  <form method="POST" action='/cgi-bin/mailpile/admin.cgi'
         id="form-login" class="clearfix animated">
    <div class='form-login'>
     <input id="login-username" type="text" name="username"

diff --git a/scripts/mailpile-admin.py b/scripts/mailpile-admin.py
@@ -48,11 +48,12 @@
 INSTALL_APACHE_SCRIPT = [
     '"%(packager)s" install screen expect',
     'a2enmod headers rewrite proxy proxy_http cgi',
-    'mkdir -p /var/lib/mailpile/apache/ /var/lib/mailpile/pids/',
+    'mkdir -p /var/lib/mailpile/apache/ /var/lib/mailpile/pids/ /usr/lib/cgi-bin/mailpile/ /usr/share/mailpile/',
     'cp -a "%(mailpile-www)s"/* /var/lib/mailpile/apache/',
-    'rm -f /var/lib/mailpile/apache/shared',
-    'ln -fs "%(mailpile-static)s" /var/lib/mailpile/apache/shared',
-    'ln -fs "%(mailpile-admin)s" /var/lib/mailpile/apache/admin.cgi',
+    'rm -f /usr/share/mailpile/default',
+    'ln -fs "%(mailpile-static)s" /usr/share/mailpile/default',
+    'rm -f /usr/lib/cgi-bin/mailpile/admin.cgi',
+    'cp "%(mailpile-admin)s" /usr/lib/cgi-bin/mailpile/admin.cgi',
     'ln -fs "%(mailpile-conf)s" /etc/apache2/conf-enabled/',
     'apache2ctl restart']