Remove apache from wiki

beaglebone.txt

@@ -5682,192 +5682,10 @@ Then extract and install it.
 #+BEGIN_SRC: bash
 export HOSTNAME=mywikidomainname.com
 tar -xzvf dokuwiki.tgz
-mv /var/www/$HOSTNAME/htdocs /var/www/$HOSTNAME/htdocs_old
+rm -rf /var/www/$HOSTNAME/htdocs
 mv dokuwiki /var/www/$HOSTNAME/htdocs
 #+END_SRC
 
-Edit the Apache configuration for your wiki site.
-
-#+BEGIN_SRC: bash
-editor /etc/apache2/sites-available/$HOSTNAME
-#+END_SRC
-
-The settings should look something like the following.  Replace /mywikidomainname.com/ with your wiki domain name.
-
-#+BEGIN_SRC: bash
-<VirtualHost *:80>
-	ServerAdmin myusername@mywikidomainname.com
-	ServerName mydomainname.com
-
-	DocumentRoot /var/www/mywikidomainname.com/htdocs
-
-    <Directory /var/www/mywikidomainname.com/htdocs>
-        order deny,allow
-        allow from all
-    </Directory>
-
-    <LocationMatch "/(data|conf|bin|inc)/">
-        order allow,deny
-        deny from all
-        satisfy all
-    </LocationMatch>
-
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride All
-	</Directory>
-
-	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-	<Directory "/usr/lib/cgi-bin">
-		AllowOverride All
-		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Order allow,deny
-		Allow from all
-	</Directory>
-
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel error
-
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-</VirtualHost>
-
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-	ServerAdmin myusername@mywikidomainname.com
-	ServerName mywikidomainname.com
-
-	DocumentRoot /var/www/mywikidomainname.com/htdocs
-
-    <Directory /var/www/mywikidomainname.com/htdocs>
-        order deny,allow
-        allow from all
-    </Directory>
-
-    <LocationMatch "/(data|conf|bin|inc)/">
-        order allow,deny
-        deny from all
-        satisfy all
-    </LocationMatch>
-
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride All
-	</Directory>
-
-	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-	<Directory "/usr/lib/cgi-bin">
-		AllowOverride All
-		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Order allow,deny
-		Allow from all
-	</Directory>
-
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel error
-
-	CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
-
-	#   SSL Engine Switch:
-	#   Enable/Disable SSL for this virtual host.
-	SSLEngine on
-
-	#   A self-signed certificate
-	SSLCertificateFile    /etc/ssl/certs/mydomainname.com.crt
-	SSLCertificateKeyFile /etc/ssl/private/mydomainname.com.key
-
-    # Options based on bettercrypto.org
-    SSLProtocol All -SSLv2 -SSLv3
-    SSLHonorCipherOrder On
-    SSLCompression off
-    SSLCipherSuite EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA
-
-	#   SSL Engine Options:
-	#   Set various options for the SSL engine.
-	#   o FakeBasicAuth:
-	#     Translate the client X.509 into a Basic Authorisation.  This means that
-	#     the standard Auth/DBMAuth methods can be used for access control.  The
-	#     user name is the `one line' version of the client's X.509 certificate.
-	#     Note that no password is obtained from the user. Every entry in the user
-	#     file needs this password: `xxj31ZMTZzkVA'.
-	#   o ExportCertData:
-	#     This exports two additional environment variables: SSL_CLIENT_CERT and
-	#     SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
-	#     server (always existing) and the client (only existing when client
-	#     authentication is used). This can be used to import the certificates
-	#     into CGI scripts.
-	#   o StdEnvVars:
-	#     This exports the standard SSL/TLS related `SSL_*' environment variables.
-	#     Per default this exportation is switched off for performance reasons,
-	#     because the extraction step is an expensive operation and is usually
-	#     useless for serving static content. So one usually enables the
-	#     exportation for CGI and SSI requests only.
-	#   o StrictRequire:
-	#     This denies access when "SSLRequireSSL" or "SSLRequire" applied even
-	#     under a "Satisfy any" situation, i.e. when it applies access is denied
-	#     and no other module can change it.
-	#   o OptRenegotiate:
-	#     This enables optimized SSL connection renegotiation handling when SSL
-	#     directives are used in per-directory context.
-	#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
-	<FilesMatch "\.(cgi|shtml|phtml|php)$">
-		SSLOptions +StdEnvVars
-	</FilesMatch>
-	<Directory /usr/lib/cgi-bin>
-		SSLOptions +StdEnvVars
-	</Directory>
-
-	#   SSL Protocol Adjustments:
-	#   The safe and default but still SSL/TLS standard compliant shutdown
-	#   approach is that mod_ssl sends the close notify alert but doesn't wait for
-	#   the close notify alert from client. When you need a different shutdown
-	#   approach you can use one of the following variables:
-	#   o ssl-unclean-shutdown:
-	#     This forces an unclean shutdown when the connection is closed, i.e. no
-	#     SSL close notify alert is send or allowed to received.  This violates
-	#     the SSL/TLS standard but is needed for some brain-dead browsers. Use
-	#     this when you receive I/O errors because of the standard approach where
-	#     mod_ssl sends the close notify alert.
-	#   o ssl-accurate-shutdown:
-	#     This forces an accurate shutdown when the connection is closed, i.e. a
-	#     SSL close notify alert is send and mod_ssl waits for the close notify
-	#     alert of the client. This is 100% SSL/TLS standard compliant, but in
-	#     practice often causes hanging connections with brain-dead browsers. Use
-	#     this only for browsers where you know that their SSL implementation
-	#     works correctly.
-	#   Notice: Most problems of broken clients are also related to the HTTP
-	#   keep-alive facility, so you usually additionally want to disable
-	#   keep-alive for those clients, too. Use variable "nokeepalive" for this.
-	#   Similarly, one has to force some clients to use HTTP/1.0 to workaround
-	#   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
-	#   "force-response-1.0" for this.
-	BrowserMatch "MSIE [2-6]" \
-		nokeepalive ssl-unclean-shutdown \
-		downgrade-1.0 force-response-1.0
-	# MSIE 7 and newer should be able to use keepalive
-	BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
-</VirtualHost>
-</IfModule>
-#+END_SRC
-
-Enable your site with:
-
-#+BEGIN_SRC: bash
-a2ensite
-#+END_SRC
-
-then select the domain name and reload.
-
-#+BEGIN_SRC: bash
-service apache2 reload
-#+END_SRC
-
 and alter permissions:
 
 #+BEGIN_SRC: bash
@@ -5897,7 +5715,7 @@ webm    video/webm
 
 Save and exit.
 
-If you need to be able to upload large files to the wiki then edit */etc/php5/apache2/php.ini* and set *upload_max_filesize* accordingly. If the directory */etc/php5/apache2* doesn't exist then you will need to install the package *libapache2-mod-php5*.
+If you need to be able to upload large files to the wiki then edit */etc/php5/fpm/php.ini* and set *upload_max_filesize* accordingly.
 
 Now you can visit your wiki and begin editing.