diff --git a/docs/_source/civicrm-libre-is.rst b/docs/_source/civicrm-libre-is.rst index c7ff969..1d32859 100644 --- a/docs/_source/civicrm-libre-is.rst +++ b/docs/_source/civicrm-libre-is.rst @@ -68,12 +68,56 @@ the best location: .. code-block:: sh - sudo chown -R jebba:jebba /var/www/html - cd /var/www/html - rm index.html + sudo chown -R jebba:jebba /var/www + cd /var/www/ unzip ~/devel/wordpress/latest.zip - mv wordpress/* . - rmdir wordpress/ - sudo chown -R www-data /var/www/html/ + sudo chown -R www-data /var/www/wordpress + +Set up apache, perhaps thusly: + +.. code-block:: sh + + rm /etc/apache2/sites-enabled/000-default* + +Edit /etc/apache2/sites-available/wordpress.conf + +.. code-block:: apache + + + ServerName civicrm.libre.is + ServerAdmin webmaster@localhost + DocumentRoot /var/www/wordpress + ErrorLog ${APACHE_LOG_DIR}/error-civicrm-libre-is.log + CustomLog ${APACHE_LOG_DIR}/access-civicrm-libre-is.log combined + RewriteEngine on + ReWriteCond %{HTTPS} off + RewriteRule ^ https://civicrm.libre.is%{REQUEST_URI} [END,NE,R=permanent] + ReWriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] + RewriteCond %{SERVER_NAME} =civicrm.libre.is + RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] + + + + ServerName civicrm.libre.is + ServerAdmin webmaster@localhost + DocumentRoot /var/www/html/civicrm-libre-is + ErrorLog ${APACHE_LOG_DIR}/error-civicrm-libre-is.log + CustomLog ${APACHE_LOG_DIR}/access-civicrm-libre-is.log combined + RewriteEngine on + ReWriteCond %{HTTPS} off [OR] + ReWriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] + ReWriteRule ^(.*)$ https://%1$1 [L,R=301] + ErrorDocument 404 /en/404.html + Include /etc/letsencrypt/options-ssl-apache.conf + ServerAlias doc.libre.is + SSLCertificateFile /etc/letsencrypt/live/civicrm.libre.is/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/civicrm.libre.is/privkey.pem + + # vim: syntax=apache ts=4 sw=4 sts=4 sr noet +.. code-block:: sh + + sudo ln -s /etc/apache2/sites-available/wordpress.conf \ + /etc/apache2/sites-enabled/ + sudo systemctl restart apache2 diff --git a/docs/_source/locale/en/LC_MESSAGES/civicrm-libre-is.po b/docs/_source/locale/en/LC_MESSAGES/civicrm-libre-is.po index 4f7b2ee..3fea449 100644 --- a/docs/_source/locale/en/LC_MESSAGES/civicrm-libre-is.po +++ b/docs/_source/locale/en/LC_MESSAGES/civicrm-libre-is.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Libre Developers Documentation 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-17 12:59-0600\n" +"POT-Creation-Date: 2024-09-17 13:17-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -118,3 +118,11 @@ msgid "" " wordpress files. Then unzip wordpress and move to the best location:" msgstr "" +#: ../../../_source/civicrm-libre-is.rst:76 +msgid "Set up apache, perhaps thusly:" +msgstr "" + +#: ../../../_source/civicrm-libre-is.rst:82 +msgid "Edit /etc/apache2/sites-available/wordpress.conf" +msgstr "" +