Commit 326cc2a4 authored by Joshua Tauberer's avatar Joshua Tauberer

obviously put our stuff in /usr/local and not /usr

parent d3cacd4a
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Mail-in-a-Box Mgmt" DESC="Mail-in-a-Box Mgmt"
NAME=mailinabox NAME=mailinabox
DAEMON=/usr/bin/mailinabox-daemon DAEMON=/usr/local/bin/mailinabox-daemon
PIDFILE=/var/run/$NAME.pid PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME
......
...@@ -42,7 +42,7 @@ server { ...@@ -42,7 +42,7 @@ server {
# Webfinger configuration. # Webfinger configuration.
location = /.well-known/webfinger { location = /.well-known/webfinger {
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME /usr/bin/mailinabox-webfinger.php; fastcgi_param SCRIPT_FILENAME /usr/local/bin/mailinabox-webfinger.php;
fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock; fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
} }
} }
......
...@@ -12,8 +12,8 @@ if [ ! -f $STORAGE_ROOT/backup/secret_key.txt ]; then ...@@ -12,8 +12,8 @@ if [ ! -f $STORAGE_ROOT/backup/secret_key.txt ]; then
fi fi
# Link the management server daemon into a well known location. # Link the management server daemon into a well known location.
rm -f /usr/bin/mailinabox-daemon rm -f /usr/local/bin/mailinabox-daemon
ln -s `pwd`/management/daemon.py /usr/bin/mailinabox-daemon ln -s `pwd`/management/daemon.py /usr/local/bin/mailinabox-daemon
# Create an init script to start the management daemon and keep it # Create an init script to start the management daemon and keep it
# running after a reboot. # running after a reboot.
......
...@@ -32,8 +32,8 @@ ln -s $(pwd)/conf/phpfcgi-initscript /etc/init.d/php-fastcgi ...@@ -32,8 +32,8 @@ ln -s $(pwd)/conf/phpfcgi-initscript /etc/init.d/php-fastcgi
update-rc.d php-fastcgi defaults update-rc.d php-fastcgi defaults
# Put our webfinger server script into a well-known location. # Put our webfinger server script into a well-known location.
cp tools/webfinger.php /usr/bin/mailinabox-webfinger.php cp tools/webfinger.php /usr/local/bin/mailinabox-webfinger.php
chown www-data.www-data /usr/bin/mailinabox-webfinger.php chown www-data.www-data /usr/local/bin/mailinabox-webfinger.php
# Start services. # Start services.
service nginx restart service nginx restart
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment