diff --git a/docs/_source/cloud-libre-is.rst b/docs/_source/cloud-libre-is.rst index f7f28bb..d5e89f3 100644 --- a/docs/_source/cloud-libre-is.rst +++ b/docs/_source/cloud-libre-is.rst @@ -67,8 +67,6 @@ Some PHP config...XXX systemctl restart apache2 - - Database ======== Use MariaDB for the databse. @@ -85,11 +83,83 @@ Then in the database: .. code-block:: sql - CREATE USER 'username'@'localhost' IDENTIFIED BY 'password'; + CREATE USER 'nextcloud'@'localhost' IDENTIFIED BY 'password'; CREATE DATABASE IF NOT EXISTS nextcloud CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; - GRANT ALL PRIVILEGES on nextcloud.* to 'username'@'localhost'; + GRANT ALL PRIVILEGES on nextcloud.* to 'nextcloud'@'localhost'; + FLUSH PRIVILEGES; EXIT +Edit /etc/mysql/my.cnf to look like this: + +.. code-block:: cfg + + [server] + skip_name_resolve = 1 + innodb_buffer_pool_size = 128M + innodb_buffer_pool_instances = 1 + innodb_flush_log_at_trx_commit = 2 + innodb_log_buffer_size = 32M + innodb_max_dirty_pages_pct = 90 + query_cache_type = 1 + query_cache_limit = 2M + query_cache_min_res_unit = 2k + query_cache_size = 64M + tmp_table_size= 64M + max_heap_table_size= 64M + slow_query_log = 1 + slow_query_log_file = /var/log/mysql/slow.log + long_query_time = 1 + + [client-server] + !includedir /etc/mysql/conf.d/ + !includedir /etc/mysql/mariadb.conf.d/ + + [client] + default-character-set = utf8mb4 + + [mysqld] + character_set_server = utf8mb4 + collation_server = utf8mb4_general_ci + transaction_isolation = READ-COMMITTED + binlog_format = ROW + innodb_large_prefix=on + innodb_file_format=barracuda + innodb_file_per_table=1 + +Restart database: + +.. code-block:: sh + + systemctl restart mariadb.service + +Edit PHP file /etc/php/8.2/apache2/conf.d/20-pdo_mysql.ini for MariaDB. +XXX maybe too: +/etc/php/8.2/cli/conf.d/20-pdo_mysql.ini +/etc/php/8.2/fpm/conf.d/20-pdo_mysql.ini + +.. code-block:: cfg + + extension=pdo_mysql.so + + [mysql] + mysql.allow_local_infile=On + mysql.allow_persistent=On + mysql.cache_size=2000 + mysql.max_persistent=-1 + mysql.max_links=-1 + mysql.default_port= + mysql.default_socket=/run/mysqld/mysqld.sock + mysql.default_host= + mysql.default_user= + mysql.default_password= + mysql.connect_timeout=60 + mysql.trace_mode=Off + +Then restart apache... + +.. code-block:: sh + + sudo systemctl restart apache2 Nextcloud @@ -111,6 +181,16 @@ Apache More =========== Set up Apache for nextcloud. +Remove the old configs: + +.. code-block:: + + rm /etc/apache2/sites-enabled/000-default.conf \ + /etc/apache2/sites-enabled/000-default-le-ssl.conf + +Then add file /etc/apache2/sites-available/cloud-libre-is.conf +with these contents: + .. code-block:: apache @@ -122,49 +202,48 @@ Set up Apache for nextcloud. RewriteEngine on ReWriteCond %{HTTPS} off ReWriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] - RewriteCond %{SERVER_NAME} =cloud.libre.is - RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] - Alias /nextcloud "/var/www/html/nextcloud/" - Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains" - - Require all granted - AllowOverride All - Options FollowSymLinks MultiViews - - Dav off - - + RewriteCond %{SERVER_NAME} =cloud.libre.is + RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] ServerName cloud.libre.is ServerAdmin webmaster@localhost DocumentRoot /var/www/html/nextcloud - ErrorLog ${APACHE_LOG_DIR}/error-cloud-libre-is.log - CustomLog ${APACHE_LOG_DIR}/access-cloud-libre-is.log combined - RewriteEngine on - ReWriteRule ^(.*)$ https://%1$1 [L,R=301] - ErrorDocument 404 /en/404.html - #Include /etc/letsencrypt/options-ssl-apache.conf - Include /etc/letsencrypt/options-ssl-apache.conf + ErrorLog ${APACHE_LOG_DIR}/error-ssl-cloud-libre-is.log + CustomLog ${APACHE_LOG_DIR}/access-ssl-cloud-libre-is.log combined + Include /etc/letsencrypt/options-ssl-apache.conf SSLCertificateFile /etc/letsencrypt/live/cloud.libre.is/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/cloud.libre.is/privkey.pem - Alias /nextcloud "/var/www/html/nextcloud/" - Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains" - - Require all granted - AllowOverride All - Options FollowSymLinks MultiViews - - Dav off - - + SSLCertificateKeyFile /etc/letsencrypt/live/cloud.libre.is/privkey.pem + + Require all granted + AllowOverride All + Options FollowSymLinks MultiViews + + Dav off + + # vim: syntax=apache ts=4 sw=4 sts=4 sr noet -Nextcloud Config -================ +Symlink it to enable it, then restart apache. + +.. code-block:: sh + + sudo ln -s /etc/apache2/sites-available/cloud-libre-is.conf \ + /etc/apache2/sites-enabled/ + rm /var/www/html/index.html + sudo systemctl restart apache2 + + +Nextcloud Admin +=============== +Now go to the new site and configure via web browser: + + ``_ + + Config changes: .. code-block:: cfg diff --git a/docs/_source/locale/en/LC_MESSAGES/cloud-libre-is.po b/docs/_source/locale/en/LC_MESSAGES/cloud-libre-is.po index 74fd086..ac3e71e 100644 --- a/docs/_source/locale/en/LC_MESSAGES/cloud-libre-is.po +++ b/docs/_source/locale/en/LC_MESSAGES/cloud-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-02 08:38-0600\n" +"POT-Creation-Date: 2024-09-02 09:07-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -29,6 +29,7 @@ msgid "Administrator documentation for Libre Cloud." msgstr "" #: ../../../_source/cloud-libre-is.rst:6 +#: ../../../_source/cloud-libre-is.rst:244 msgid "``_" msgstr "" @@ -76,67 +77,104 @@ msgstr "" msgid "Some PHP config...XXX" msgstr "" -#: ../../../_source/cloud-libre-is.rst:73 +#: ../../../_source/cloud-libre-is.rst:71 msgid "Database" msgstr "" -#: ../../../_source/cloud-libre-is.rst:74 +#: ../../../_source/cloud-libre-is.rst:72 msgid "Use MariaDB for the databse." msgstr "" -#: ../../../_source/cloud-libre-is.rst:76 +#: ../../../_source/cloud-libre-is.rst:74 msgid "" "``_" msgstr "" -#: ../../../_source/cloud-libre-is.rst:84 +#: ../../../_source/cloud-libre-is.rst:82 msgid "Then in the database:" msgstr "" -#: ../../../_source/cloud-libre-is.rst:96 +#: ../../../_source/cloud-libre-is.rst:92 +msgid "Edit /etc/mysql/my.cnf to look like this:" +msgstr "" + +#: ../../../_source/cloud-libre-is.rst:129 +msgid "Restart database:" +msgstr "" + +#: ../../../_source/cloud-libre-is.rst:135 +msgid "" +"Edit PHP file /etc/php/8.2/apache2/conf.d/20-pdo_mysql.ini for MariaDB. XXX " +"maybe too: /etc/php/8.2/cli/conf.d/20-pdo_mysql.ini /etc/php/8.2/fpm/conf." +"d/20-pdo_mysql.ini" +msgstr "" + +#: ../../../_source/cloud-libre-is.rst:158 +msgid "Then restart apache..." +msgstr "" + +#: ../../../_source/cloud-libre-is.rst:166 msgid "Nextcloud" msgstr "" -#: ../../../_source/cloud-libre-is.rst:97 +#: ../../../_source/cloud-libre-is.rst:167 msgid "Get Nextcloud source." msgstr "" -#: ../../../_source/cloud-libre-is.rst:111 +#: ../../../_source/cloud-libre-is.rst:181 msgid "Apache More" msgstr "" -#: ../../../_source/cloud-libre-is.rst:112 +#: ../../../_source/cloud-libre-is.rst:182 msgid "Set up Apache for nextcloud." msgstr "" -#: ../../../_source/cloud-libre-is.rst:167 -msgid "Nextcloud Config" +#: ../../../_source/cloud-libre-is.rst:184 +msgid "Remove the old configs:" msgstr "" -#: ../../../_source/cloud-libre-is.rst:168 +#: ../../../_source/cloud-libre-is.rst:191 +msgid "" +"Then add file /etc/apache2/sites-available/cloud-libre-is.conf with these " +"contents:" +msgstr "" + +#: ../../../_source/cloud-libre-is.rst:230 +msgid "Symlink it to enable it, then restart apache." +msgstr "" + +#: ../../../_source/cloud-libre-is.rst:241 +msgid "Nextcloud Admin" +msgstr "" + +#: ../../../_source/cloud-libre-is.rst:242 +msgid "Now go to the new site and configure via web browser:" +msgstr "" + +#: ../../../_source/cloud-libre-is.rst:247 msgid "Config changes:" msgstr "" -#: ../../../_source/cloud-libre-is.rst:175 +#: ../../../_source/cloud-libre-is.rst:254 msgid "Update config:" msgstr "" -#: ../../../_source/cloud-libre-is.rst:181 +#: ../../../_source/cloud-libre-is.rst:260 msgid "Background jobs:" msgstr "" -#: ../../../_source/cloud-libre-is.rst:183 +#: ../../../_source/cloud-libre-is.rst:262 msgid "" "``_" msgstr "" -#: ../../../_source/cloud-libre-is.rst:185 +#: ../../../_source/cloud-libre-is.rst:264 msgid "FPM config:" msgstr "" -#: ../../../_source/cloud-libre-is.rst:187 +#: ../../../_source/cloud-libre-is.rst:266 msgid "" "``_ `