Merge pull request #2129 from RealRancor/web_server_part2

web server -> Web server
This commit is contained in:
Carla Schroder 2016-02-03 10:42:22 -08:00
commit 9e2f7653b4
18 changed files with 35 additions and 35 deletions

View File

@ -18,7 +18,7 @@ This document will cover the following steps:
* Setup of the ownCloud user in Oracle: This involves setting up a user space
in Oracle for setting up the ownCloud database.
* Installing the Oracle Instant Client on the web server (facilitating the
* Installing the Oracle Instant Client on the Web server (facilitating the
connection to the Oracle Database).
* Compiling and installing the Oracle PHP Plugin oci8 module
* Pointing ownCloud at the Oracle database in the initial setup process

View File

@ -137,8 +137,8 @@ this input box.
To be able to use this input box you need to make sure that:
* your web server is be able to use the ``.htaccess`` file shipped by ownCloud (Apache only)
* the user your web server is running as has write permissions to the files ``.htaccess`` and ``.user.ini``
* your Web server is be able to use the ``.htaccess`` file shipped by ownCloud (Apache only)
* the user your Web server is running as has write permissions to the files ``.htaccess`` and ``.user.ini``
:ref:`strong_perms_label` might prevent write access to these files. As an admin you need
to decide between the ability to use the input box and a more secure ownCloud installation

View File

@ -186,7 +186,7 @@ Example
"priority":150
}
.. note:: You must ensure that the web server has sufficient permissions on the folder.
.. note:: You must ensure that the Web server has sufficient permissions on the folder.
FTP (or FTPS)
~~~~~~~~~~~~~

View File

@ -42,9 +42,9 @@ your server using the Internet. For example::
Cron
~~~~
Using the operating system cron feature is the preferred method for executing regular tasks. This method enables the execution of scheduled jobs without the inherent limitations the web server might have.
Using the operating system cron feature is the preferred method for executing regular tasks. This method enables the execution of scheduled jobs without the inherent limitations the Web server might have.
To run a cron job on a \*nix system, every 15 minutes, under the default web server user (often, ``www-data`` or ``wwwrun``), you must set up the following cron job to call the **cron.php** script::
To run a cron job on a \*nix system, every 15 minutes, under the default Web server user (often, ``www-data`` or ``wwwrun``), you must set up the following cron job to call the **cron.php** script::
# crontab -u www-data -e
*/15 * * * * php -f /var/www/owncloud/cron.php

View File

@ -162,7 +162,7 @@ are accessible from the ownCloud network. If you do not want this you need to
ensure that your ownCloud is properly installed in a segregated network and proper
firewall rules are in place.
Serve security related Headers by the web server
Serve security related Headers by the Web server
------------------------------------------------
Basic security headers are served by ownCloud already in a default environment.
@ -181,7 +181,7 @@ These headers are hard-coded into the ownCloud server, and need no intervention
by the server administrator.
For optimal security, administrators are encouraged to serve these basic HTTP
headers by the web server to enforce them on response. To do this Apache has to
headers by the Web server to enforce them on response. To do this Apache has to
be configured to use the ``.htaccess`` file and the following Apache
modules need to be enabled:
@ -189,7 +189,7 @@ modules need to be enabled:
- mod_env
Administrators can verify whether this security change is active by accessing a
static resource served by the web server and verify that the above mentioned
static resource served by the Web server and verify that the above mentioned
security headers are shipped.
.. _Mozilla SSL Configuration Generator: https://mozilla.github.io/server-side-tls/ssl-config-generator/

View File

@ -5,9 +5,9 @@ In production environments, JavaScript and CSS files should be delivered in a co
ownCloud can automatically collect all JavaScript and CSS files, aggregate and compress them to then save the result in a folder called 'assets' which can be found in the folder where ownCloud has been installed.
If your web server has write access to your ownCloud installation, then the 'assets' folder will be automatically created for you, otherwise, you need to create it yourself before enabling that option and you must give write access to your web server user.
If your Web server has write access to your ownCloud installation, then the 'assets' folder will be automatically created for you, otherwise, you need to create it yourself before enabling that option and you must give write access to your Web server user.
Assets found in that folder will from now on be served as static files by your web server and will be automatically refreshed whenever ownCloud or one of its apps is updated.
Assets found in that folder will from now on be served as static files by your Web server and will be automatically refreshed whenever ownCloud or one of its apps is updated.
It's important to note that apps installed via git might not always update their version number with every commit and this could lead to an out-of-sync asset folder.
It is not recommended to enable asset-pipelining when using apps pulled via git.

View File

@ -177,7 +177,7 @@ Authentication via an existing LDAP or Active Directory server.
Totally possible. Whatever you prefer :-)
Jörn: AFAIK you need to do SSL offloading to do sticky sessions, because the
load balancer has to look into the http stream or rely on the client IP to
determine the web server for the session. Not doing SSL offloading instead
determine the Web server for the session. Not doing SSL offloading instead
requires you to use a shared session (via memcached or redis) because the
requests are distributed via round robin or least load. It allows you to
scale out the ssl load by adding more applicaton servers. So ... I think it

View File

@ -82,7 +82,7 @@ ownCloud settings.
In the installation process a virtual host is set up (Apache is required
therefore). If you want to modify the settings, edit
:file:`/etc/apache2/sites-available/owncloud` and restart the web server. You
:file:`/etc/apache2/sites-available/owncloud` and restart the Web server. You
might want to do it to enable HTTPS connections. Besides that, you can edit the
**.htaccess-File in /var/www/owncloud/**. In the latter file the
PHP limits for file transfer are also specified.

View File

@ -280,7 +280,7 @@ and if running in a subfolder like ``owncloud``:
For the first case the :file:`.htaccess` file shipped with ownCloud should do
this work for your when running Apache. You only need to make sure that your
web server is using this file. When running nginx please refer to the
Web server is using this file. When running nginx please refer to the
:ref:`nginx_configuration_example` example.
.. note: The following step is important for users using the linux packages

View File

@ -30,7 +30,7 @@ the new location. It is also assumed that the authentication method
#. Set up the new machine with the desired OS, install and configure the
web server as well as PHP for ownCloud (e.g. permissions or file upload size
Web server as well as PHP for ownCloud (e.g. permissions or file upload size
limits) and make sure the PHP version matches ownCloud supported
configuration and all relevant PHP extensions are installed. Also set up
the database and make sure it is an ownCloud supported configuration. If
@ -41,7 +41,7 @@ the new location. It is also assumed that the authentication method
#. On the original machine then stop ownCloud. First activate the
maintenance mode. After waiting for 6-7 minutes for all sync clients to
register the server as in maintenance mode stop the application and/or
web server that serves ownCloud.
Web server that serves ownCloud.
#. Create a dump from the database and copy it to the new machine. There
@ -61,10 +61,10 @@ the new location. It is also assumed that the authentication method
#. While still having ownCloud in maintenance mode (confirm!) and **BEFORE**
changing the ``CNAME`` record in the DNS start up the database, web server /
changing the ``CNAME`` record in the DNS start up the database, Web server /
application server on the new machine and point your web browser to the
migrated ownCloud instance. Confirm that you see the maintenance mode
notice, that a logfile entry is written by both the web server and
notice, that a logfile entry is written by both the Web server and
ownCloud and that no error messages occur. Then take ownCloud out of
maintenance mode and repeat. Log in as admin and confirm normal function
of ownCloud.

View File

@ -18,7 +18,7 @@ ownCloud Deployment Architecture
Before discussing how to monitor ownCloud, it is important to understand the architecture of a
typical ownCloud deployment. These monitoring best practices are developed based on the use of load
balanced web servers, a clustered database running a distributed database storage engine, such as
balanced Web servers, a clustered database running a distributed database storage engine, such as
MySQL NDB, and a clustered filesystem, such as Red Hat Storage.
It is assumed that specific enterprise tools (monitoring, log management, etc) to monitor

View File

@ -34,6 +34,6 @@ Dont forget to configure the cron service on the server by executing::
sudo crontab -u http -e
where **http** is your web server user, and add::
where **http** is your Web server user, and add::
*/15 * * * * php -f /srv/http/owncloud/cron.php

View File

@ -15,7 +15,7 @@ The following sections will present an overview over how that request is being p
Front controller
================
In the beginning, all requests are sent to ownCloud's :file:`index.php` which in turn executes :file:`lib/base.php`. This file inspects the HTTP headers and abstracts away differences between different web servers and initializes the basic classes. Afterwards the basic apps are being loaded in the following order:
In the beginning, all requests are sent to ownCloud's :file:`index.php` which in turn executes :file:`lib/base.php`. This file inspects the HTTP headers and abstracts away differences between different Web servers and initializes the basic classes. Afterwards the basic apps are being loaded in the following order:
* Authentication backends
* Filesystem

View File

@ -141,7 +141,7 @@ Why do we have it?
What does a developer think?
"Ill check the Scenario described earlier works as expected. If necessary
Ill update the related Gherkin Scenarios. `Jenkins`_ will test the scenario
on all kinds of platforms, web server and database combinations with
on all kinds of platforms, Web server and database combinations with
`cucumber`_."
When can I pull?
@ -159,13 +159,13 @@ Why do we have it?
With the Gherkin Scenario from the Concept Phase reviewers have a checklist to
test if a Bug has been solved and if an Enhancement works as expected. **The
most eager reviewer we have is Jenkins**. When it comes to testing he soldiers
on going through the different combinations of platform, web server and
on going through the different combinations of platform, Web server and
database.
What does a developer think?
"Damn! If I had written the Gherkin Scenarios and Cucumber Step Definitions I
could leave the task of testing this on the different combinations of platform,
web server and database to Jenkins. Ill miss something when doing this
Web server and database to Jenkins. Ill miss something when doing this
manually.*
When can I pull?

View File

@ -52,7 +52,7 @@ Github offers several search queries which can be useful to find a list of bugs
* `Least commented issues <https://github.com/issues?q=is%3Aissue+user%3Aowncloud+is%3Aopen+no%3Aassignee+no%3Amilestone+no%3Alabel+sort%3Acomments-asc+>`_
* `Bugs which need info <https://github.com/issues?q=is%3Aissue+user%3Aowncloud+is%3Aopen+label%3A%22Needs+info%22+sort%3Acreated-asc+>`_
But there are more methods. For example, if you are a user of ownCloud with a specific setup like using nginx as web server or dropbox as storage, or using the encryption app, you could look for bugs with these keywords. You can then use your knowledge of your installation and your installation itself to see if bugs are (still) valid or reproduce them.
But there are more methods. For example, if you are a user of ownCloud with a specific setup like using nginx as Web server or dropbox as storage, or using the encryption app, you could look for bugs with these keywords. You can then use your knowledge of your installation and your installation itself to see if bugs are (still) valid or reproduce them.
Once you have picked an issue, add a comment that you've started triaging:

View File

@ -40,7 +40,7 @@ Then you can simply run the created test with phpunit.
.. note:: If you use ownCloud functions in your class under test (i.e: OC::getUser()) you'll need to bootstrap ownCloud or use dependency injection.
.. note:: You'll most likely run your tests under a different user than the web server. This might cause problems with your PHP settings (i.e: open_basedir) and requires you to adjust your configuration.
.. note:: You'll most likely run your tests under a different user than the Web server. This might cause problems with your PHP settings (i.e: open_basedir) and requires you to adjust your configuration.
An example for a simple test would be:
@ -101,7 +101,7 @@ To do this, you'll need to provide the ``--bootstrap`` argument when running PHP
phpunit --bootstrap tests/bootstrap.php apps/myapp/tests/testsuite.php
If you run the test under a different user than your web server, you'll have to
If you run the test under a different user than your Web server, you'll have to
adjust your php.ini and file rights.
:file:`/etc/php/php.ini`::

View File

@ -18,7 +18,7 @@ When debug mode is enabled in ownCloud, a variety of debugging features are enab
Identifying errors
------------------
ownCloud uses custom error PHP handling that prevents errors being printed to web server log files or command line output. Instead, errors are generally stored in ownCloud's own log file, located at: :file:`/data/owncloud.log`
ownCloud uses custom error PHP handling that prevents errors being printed to Web server log files or command line output. Instead, errors are generally stored in ownCloud's own log file, located at: :file:`/data/owncloud.log`
Debugging variables
@ -38,7 +38,7 @@ not:
<?php trigger_error( "\$user = $user" ); // may not be logged anywhere ?>
To disable custom error handling in ownCloud (and have PHP and your web server handle errors instead), see Debug mode.
To disable custom error handling in ownCloud (and have PHP and your Web server handle errors instead), see Debug mode.
Using a PHP debugger (XDebug)

View File

@ -8,10 +8,10 @@ Development Environment
Please follow the steps on this page to set up your development environment.
Set up web server and database
Set up Web server and database
==============================
First `set up your web server and database <https://doc.owncloud.org/server/9.0/admin_manual/#installation>`_ (**Section**: Manual Installation - Prerequisites).
First `set up your Web server and database <https://doc.owncloud.org/server/9.0/admin_manual/#installation>`_ (**Section**: Manual Installation - Prerequisites).
.. TODO ON RELEASE: Update version number above on release
@ -29,14 +29,14 @@ To check out the source from `GitHub`_ you will need to install git (see `Settin
Gather information about server setup
-------------------------------------
To get started the basic git repositories need to cloned into the web server's directory. Depending on the distribution this will either be
To get started the basic git repositories need to cloned into the Web server's directory. Depending on the distribution this will either be
* **/var/www**
* **/var/www/html**
* **/srv/http**
Then identify the user and group the web server is running as and the Apache user and group for the **chown** command will either be
Then identify the user and group the Web server is running as and the Apache user and group for the **chown** command will either be
* **http**
* **www-data**
@ -46,7 +46,7 @@ Then identify the user and group the web server is running as and the Apache use
Check out the code
------------------
The following commands are using **/var/www** as the web server's directory and **www-data** as user name and group.
The following commands are using **/var/www** as the Web server's directory and **www-data** as user name and group.
Install the `development tool <https://github.com/owncloud/ocdev/blob/master/README.rst#installation>`_
@ -66,7 +66,7 @@ Adjust rights::
sudo chmod o-rw /var/www
Finally restart the web server (this might vary depending on your distribution)::
Finally restart the Web server (this might vary depending on your distribution)::
sudo systemctl restart httpd.service