diff --git a/docs/source/_includes/example_apache_conf.rst b/docs/source/_includes/example_apache_conf.rst new file mode 100644 index 00000000..62d29f27 --- /dev/null +++ b/docs/source/_includes/example_apache_conf.rst @@ -0,0 +1,46 @@ +* An example Apache .conf:: + + + ServerAdmin your@mail.com + ServerName flightdeck.some.domain + + + Order deny,allow + Allow from all + Options Indexes FollowSymLinks + + + + SetHandler default + + Alias /adminmedia /path/to/FlightDeck/flightdeck/adminmedia + + + SetHandler default + + Alias /media/tutorial /path/to/FlightDeck/flightdeck/tutorial/media + + + SetHandler default + + Alias /media/api /path/to/FlightDeck/flightdeck/api/media + + + SetHandler default + + Alias /media/jetpack /path/to/FlightDeck/flightdeck/jetpack/media + + + SetHandler default + + Alias /media /path/to/FlightDeck/flightdeck/media + + LogLevel warn + ErrorLog /path/to/FlightDeck/logs/apache_error.log + CustomLog /path/to/FlightDeck/logs/apache_access.log combined + + WSGIDaemonProcess flightdeck user=www-data group=www-data threads=25 + WSGIProcessGroup flightdeck + + WSGIScriptAlias / /path/to/FlightDeck/apache/config_local.wsgi + diff --git a/docs/source/server/installation.rst b/docs/source/server/installation.rst index 844c0e3f..6a3e4549 100644 --- a/docs/source/server/installation.rst +++ b/docs/source/server/installation.rst @@ -27,3 +27,5 @@ Configure Apache ---------------- .. include:: ../_includes/example_apache_wsgi.rst + +.. include:: ../_includes/example_apache_conf.rst diff --git a/tools/apache-example.conf b/tools/apache-example.conf deleted file mode 100644 index 235e569b..00000000 --- a/tools/apache-example.conf +++ /dev/null @@ -1,44 +0,0 @@ - - ServerAdmin your@mail.com - ServerName flightdeck.some.domain - - - Order deny,allow - Allow from all - Options Indexes FollowSymLinks - - - - SetHandler default - - Alias /adminmedia /path/to/FlightDeck/flightdeck/adminmedia - - - SetHandler default - - Alias /media/tutorial /path/to/FlightDeck/flightdeck/tutorial/media - - - SetHandler default - - Alias /media/api /path/to/FlightDeck/flightdeck/api/media - - - SetHandler default - - Alias /media/jetpack /path/to/FlightDeck/flightdeck/jetpack/media - - - SetHandler default - - Alias /media /path/to/FlightDeck/flightdeck/media - - LogLevel warn - ErrorLog /path/to/FlightDeck/logs/apache_error.log - CustomLog /path/to/FlightDeck/logs/apache_access.log combined - - WSGIDaemonProcess flightdeck user=www-data group=www-data threads=25 - WSGIProcessGroup flightdeck - - WSGIScriptAlias / /path/to/FlightDeck/apache/config_local.wsgi -