[owncloud] drop db server deps, improve docs, disable some checks
Adam Williamson
adamwill at fedoraproject.org
Wed Oct 29 23:39:12 UTC 2014
commit 3b2243c0be2a813e2c58a203bb4d1dc6c2b04cdb
Author: Adam Williamson <awilliam at redhat.com>
Date: Wed Oct 29 16:37:08 2014 -0700
drop db server deps, improve docs, disable some checks
Don't depend on database server packages (user may wish to use
a remote database server). Updates and improvements to the main
README and database package descriptions. Disable checking for
newer ownCloud versions and working .htaccess files, neither of
which we want in a packaged OC. Forward-ported from el6 branch.
owncloud-README.fedora | 58 +++++++++++++++++++++++++++--------------------
owncloud-config.php | 2 +
owncloud.spec | 30 +++++++++++++++++++-----
3 files changed, 59 insertions(+), 31 deletions(-)
---
diff --git a/owncloud-README.fedora b/owncloud-README.fedora
index 04e9180..8d33841 100644
--- a/owncloud-README.fedora
+++ b/owncloud-README.fedora
@@ -4,7 +4,7 @@ ownCloud packaging notes
Start
------
After installation you should be able to access the login/configuration page
-on following url:
+at the following URL:
http://localhost/owncloud/ or http://localhost/
@@ -12,50 +12,58 @@ If not, make sure your webserver is running properly.
Webserver
---------
-Currently ownCloud in Fedora supports following webserver: httpd and nginx.
-You must install at least on webserver subpackage (owncloud-<webserver>). These
-packages include additional configuration files for the webservers. Note that
-these files are just samples. For production setup you should adjust them to
-your needs. Also remote access is disabled by default.
+Currently ownCloud in Fedora supports httpd (Apache) and nginx. You must install
+at least one webserver subpackage (owncloud-<webserver>). These packages
+include additional configuration files for the webservers. Note that these
+files are just samples. For production setup you should adjust (or, better,
+override) them to your needs. Remote access is disabled by default.
Database
--------
-You can choose between 3 databases: MariaDB / MySQL, PostgreSQL and SQLite.
-For each of them exists a corresponding owncloud subpackage (owncloud-<database>).
-You are required to install at least one of them.
+You can choose between three databases: MySQL, PostgreSQL and SQLite.
+For each of them there is an ownCloud subpackage (owncloud-<database>).
+You are required to install at least one of them. The packages only ensure
+the necessary requirements to communicate with a database server of that type
+are installed, they do not require the database server package itself, as
+you may wish to use a remote database server. If you wish to use a local one,
+you must ensure it is installed and configured.
For larger installs you should use MySQL or PostgreSQL.
-If you choose MySQL or PostgreSQL, keep in mind that you must create a database and user
-for owncloud manually, before you can finish the setup process.
-
-For specific instructions, please refer to the documentation in the database subpackages.
+If you choose MySQL or PostgreSQL, keep in mind that you must create a database
+and user for ownCloud manually, before you can finish the setup process. The
+README.postgresql and README.mysql files provide more details and help with
+this.
Configuration
-------------
-You can find the main configuration file at '/etc/owncloud/config.php' after
-you have run ownCloud's initial configuration wizard.
-An example configuration file with a lot of comments is included in the
-documentation.
-
+You can find the main configuration file at '/etc/owncloud/config.php'. Until
+you first access the server it will be just a small stub containing settings
+that differ in this package from the upstream defaults. After you first access
+ownCloud, the initial setup process will populate it with some more settings.
+Other settings that can be provided in this file are documented at:
+http://doc.owncloud.org/server/7.0/admin_manual/configuration/configuration_config_sample_php.html
User Data
---------
-The default data directory is '/var/lib/owncloud/data'. Every file that is uploaded
-by your users to ownCloud gets saved into this folder. Consider doing a backup of this
-directory, together with the database and the main configuration.
+The default data directory is '/var/lib/owncloud/data'. Every file that is
+uploaded by your users to ownCloud gets saved into this folder. Consider doing
+a backup of this directory, together with the database and the main
+configuration. Note that if you change this location, you must set appropriate
+ownership and SELinux context attributes.
Logging
-------
-Specified by the main configuration, ownCloud sends messages to the system
+As specified by the configuration file, ownCloud sends messages to the system
logger, which means in a standard Fedora configuration it will log to the
systemd journal: try "journalctl -b | grep ownCloud". You can also change the
loglevel or switch to the built-in log mechanism of ownCloud.
App Store
---------
-If you install additional third party apps using the built-in app store, you can find them
-in the directory '/var/lib/owncloud/apps'. This functionality is enabled by default.
+If you install additional third party apps using the built-in app store, you
+can find them in the directory '/var/lib/owncloud/apps'. This functionality is
+enabled by default.
-For further informations see also: http://owncloud.org/
+For further information see http://owncloud.org/ and http://doc.owncloud.org/
diff --git a/owncloud-config.php b/owncloud-config.php
index 2420306..71c57ee 100644
--- a/owncloud-config.php
+++ b/owncloud-config.php
@@ -2,6 +2,8 @@
$CONFIG = array (
"log_type" => "syslog",
"datadirectory" => "/var/lib/owncloud/data",
+ "updatechecker" => false,
+ "check_for_working_htaccess" => false,
"apps_paths" => array(
0 =>
array (
diff --git a/owncloud.spec b/owncloud.spec
index 20ad0b2..fe36c5a 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
Name: owncloud
Version: 7.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Private file sync and share server
License: AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
@@ -167,33 +167,48 @@ Requires: php-fpm nginx
%package mysql
-Summary: Virtual package providing MySQL dependencies for %{name}
+Summary: MySQL database support for ownCloud
Provides: %{name}-database = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: php-mysql
-Requires: mysql-server
%description mysql
%{summary}
+This package ensures the necessary dependencies are in place for ownCloud to
+work with MySQL / MariaDB databases. It does not require a MySQL / MariaDB
+server to be installed, as you may well wish to use a remote database
+server.
+
+If you want the database to be on the same system as ownCloud itself, you must
+also install and enable a MySQL / MariaDB server package. See README.mysql for
+more details.
%package postgresql
-Summary: Virtual package providing PostgreSQL dependencies for %{name}
+Summary: PostgreSQL database support for ownCloud
Provides: %{name}-database = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: php-pgsql
-Requires: postgresql-server
%description postgresql
%{summary}
+This package ensures the necessary dependencies are in place for ownCloud to
+work with a PostgreSQL database. It does not require the PostgreSQL server
+package to be installed, as you may well wish to use a remote database
+server.
+
+If you want the database to be on the same system as ownCloud itself, you must
+also install and enable the PostgreSQL server package. See README.postgresql
+for more details.
+
%package sqlite
-Summary: Virtual package providing Sqlite3 dependencies for %{name}
+Summary: SQLite 3 database support for ownCloud
Provides: %{name}-database = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
@@ -202,6 +217,9 @@ Requires: php-sqlite3 php-pcre
%description sqlite
%{summary}
+This package ensures the necessary dependencies are in place for ownCloud to
+work with an SQLite 3 database stored on the local system.
+
%prep
%setup -q -n %{name}
More information about the scm-commits
mailing list