diff --git a/pivilion-manual-setup.md b/pivilion-manual-setup.md index d9ed6be..cde6abd 100644 --- a/pivilion-manual-setup.md +++ b/pivilion-manual-setup.md @@ -311,14 +311,17 @@ You can observe their values and read the comments around them to figure out wha The Pivilion Apache configuration keeps all its files in -`/var/www/html/pivilion/` -`|-- gen --> data that apache serves to clients (hotglue files, static HTML or your own website data go here)` -`| --- .htaccess --> file that handles redirects (very important for hotspot mode, very important that it isn't there in onion mode)` -`|-- gen.php --> generator script main PHP file` -`|-- images --> generator scirpt images` -`|-- index.html --> HTML layout for generator script` -`|-- scripts --> scripts for generator script` -` -- skeleton --> files that are copied into galleries generated by the generator script` + +``` +/var/www/html/pivilion/ +|-- gen --> data that apache serves to clients (hotglue files, static HTML or your own website data go here) +| `--- .htaccess --> file that handles redirects (very important for hotspot mode, very important that it isn't there in onion mode) +|-- gen.php --> generator script main PHP file +|-- images --> generator scirpt images +|-- index.html --> HTML layout for generator script +|-- scripts --> scripts for generator script +`-- skeleton --> files that are copied into galleries generated by the generator script +``` ### .htaccess File Breakdown @@ -341,22 +344,24 @@ This allows access to the directory "img" in the directory the .htaccess file re Default .htaccess for reference: -`RewriteEngine on` -`RewriteCond %{REQUEST_URI} !(\/index\.php)$` -`RewriteCond %{REQUEST_URI} !(\/pi-logo_128\.png)$` -`RewriteCond %{REQUEST_URI} !(\/content\/.*)$` -`RewriteCond %{REQUEST_URI} !(\/index\.php)$` -`RewriteCond %{REQUEST_URI} !(\/pi-logo_128\.png)$` -`RewriteCond %{REQUEST_URI} !(\/content\/.*)$` -`RewriteCond %{REQUEST_URI} !(\/css\/.*)$` -`RewriteCond %{REQUEST_URI} !(\/doc\/.*)$` -`RewriteCond %{REQUEST_URI} !(\/docker\/.*)$` -`RewriteCond %{REQUEST_URI} !(\/img\/.*)$` -`RewriteCond %{REQUEST_URI} !(\/js\/.*)$` -`RewriteCond %{REQUEST_URI} !(\/modules\/.*)$` -`RewriteCond %{REQUEST_URI} !(\/tests\/.*)$` -`RewriteCond %{REQUEST_URI} !(\/*.php)$` -`RewriteRule ^(.*)$ http://10.1.1.1/index.php [L,R=301]` +``` +RewriteEngine on +RewriteCond %{REQUEST_URI} !(\/index\.php)$ +RewriteCond %{REQUEST_URI} !(\/pi-logo_128\.png)$ +RewriteCond %{REQUEST_URI} !(\/content\/.*)$ +RewriteCond %{REQUEST_URI} !(\/index\.php)$ +RewriteCond %{REQUEST_URI} !(\/pi-logo_128\.png)$ +RewriteCond %{REQUEST_URI} !(\/content\/.*)$ +RewriteCond %{REQUEST_URI} !(\/css\/.*)$ +RewriteCond %{REQUEST_URI} !(\/doc\/.*)$ +RewriteCond %{REQUEST_URI} !(\/docker\/.*)$ +RewriteCond %{REQUEST_URI} !(\/img\/.*)$ +RewriteCond %{REQUEST_URI} !(\/js\/.*)$ +RewriteCond %{REQUEST_URI} !(\/modules\/.*)$ +RewriteCond %{REQUEST_URI} !(\/tests\/.*)$ +RewriteCond %{REQUEST_URI} !(\/*.php)$ +RewriteRule ^(.*)$ http://10.1.1.1/index.php [L,R=301] +``` The last line