diff --git a/admin_manual/enterprise_installation/index.rst b/admin_manual/enterprise_installation/index.rst index 510b9e43c..eff5c5a4d 100644 --- a/admin_manual/enterprise_installation/index.rst +++ b/admin_manual/enterprise_installation/index.rst @@ -7,7 +7,6 @@ Enterprise Subscription Installation (ES Only) :maxdepth: 2 linux_installation - windows2_installation apps_management_installation supported_apps_installation license_keys_installation diff --git a/admin_manual/installation/index.rst b/admin_manual/installation/index.rst index 529edcb4c..a59544275 100644 --- a/admin_manual/installation/index.rst +++ b/admin_manual/installation/index.rst @@ -6,8 +6,6 @@ Installation :maxdepth: 2 linux_installation - windows_installation - macos_installation installation_wizard appliance_installation apps_management_installation @@ -17,3 +15,6 @@ Installation ucs_installation yaws_configuration selinux_configuration + macos_installation + windows_installation + windows2_installation diff --git a/admin_manual/installation/linux_installation.rst b/admin_manual/installation/linux_installation.rst index 049e26d49..d2e83dbc9 100644 --- a/admin_manual/installation/linux_installation.rst +++ b/admin_manual/installation/linux_installation.rst @@ -5,13 +5,14 @@ Preferred Linux Installation Method Recommend Setup and Supported Platforms --------------------------------------- -See the :doc:`../release_notes` for the recommended ownCloud setup and supported platforms. +See the :doc:`../release_notes` for the recommended ownCloud setup and supported +platforms. Installing ownCloud Enterprise Subscription ------------------------------------------- -See :doc:`../enterprise_installation/linux_installation` for instructions on installing -ownCloud Enterprise Subscription. +See :doc:`../enterprise_installation/linux_installation` for instructions on +installing ownCloud Enterprise Subscription. Supported Distribution Packages ------------------------------- diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index 0f70adc39..7843e087b 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -1,12 +1,20 @@ +============================ Manual Installation on Linux ============================ -Installing ownCloud on Linux from the openSUSE Build Service packages is the preferred method (see :doc:`linux_installation`). -These are maintained by ownCloud engineers, and you can use your package manager to keep your ownCloud server up-to-date. +Installing ownCloud on Linux from the openSUSE Build Service packages is the +preferred method (see :doc:`linux_installation`). These are maintained by +ownCloud engineers, and you can use your package manager to keep your ownCloud +server up-to-date. -If there are no packages for your Linux distribution, or you prefer installing from sources, you can setup ownCloud from scratch -using a classic LAMP stack (Linux, Apache, MySQL/MariaDB, PHP). This document provides a complete walk-through for installing -ownCloud on Ubuntu 14.04 LTS Server with Apache and MySQL. +.. note:: Enterprise Subscription customers should refer to + :doc:`../enterprise_installation/linux_installation` + +If there are no packages for your Linux distribution, or you prefer installing +from sources, you can setup ownCloud from scratch using a classic LAMP stack +(Linux, Apache, MySQL/MariaDB, PHP). This document provides a complete +walk-through for installing ownCloud on Ubuntu 14.04 LTS Server with Apache and +MySQL. Prerequisites ------------- @@ -272,10 +280,6 @@ Keep in mind that changes to php.ini may have to be done on more than one ini fi Other Web Servers ----------------- - -**Microsoft Internet Information Server (IIS)** - -See :doc:`windows_installation` for further instructions. **Nginx Configuration** @@ -288,3 +292,7 @@ See :doc:`yaws_configuration` **Hiawatha Configuration** See :doc:`hiawatha_configuration` + +**Microsoft Internet Information Server (IIS)** + +See :doc:`windows_installation` for further instructions. diff --git a/admin_manual/enterprise_installation/windows2_installation.rst b/admin_manual/installation/windows2_installation.rst similarity index 81% rename from admin_manual/enterprise_installation/windows2_installation.rst rename to admin_manual/installation/windows2_installation.rst index 959f1ff9a..fb14a3431 100644 --- a/admin_manual/enterprise_installation/windows2_installation.rst +++ b/admin_manual/installation/windows2_installation.rst @@ -1,6 +1,6 @@ -============================================================================== -Installing ownCloud Enterprise Subscription on Windows with SQL Server and IIS -============================================================================== +====================================================== +Installing ownCloud on Windows with SQL Server and IIS +====================================================== The most streamlined method of installing ownCloud on a Windows server is to use the Microsoft Web Platform Installer (WPI). Download this free utility from @@ -17,18 +17,9 @@ Microsoft Web Platform Installer (WPI). Download this free utility from ownCloud is not supported on the Internet Server Application Programming Interface (ISAPI). - For these reasons, while ownCloud server will run on Windows and is supported, - it is not recommended at this time. - -You also need the ownCloud package, which you can download from the ``ownCloud 8 -Enterprise Edition for Windows Files`` folder in your account on -`Customer.owncloud.com `_. - -.. note:: If you are upgrading an existing ownCloud installation, please refer to the - Customer Advisory document in the ``ownCloud 8 Enterprise Edition for Windows`` folder - in your account on - `Customer.owncloud.com `_. . - + For these reasons, ownCloud on Windows is not recommended and not + supported. + Installing IIS, PHP, and SQL Server ----------------------------------- @@ -120,8 +111,9 @@ Then restart the IIS service to apply all changes. Installing ownCloud ------------------- -Unzip your ownCloud archive (downloaded from your account on -`Customer.owncloud.com `_), which unpacks to a single +Download the latest version of ownCloud from http://owncloud.org/download. +You may download the archive in either tar.bz2 or zip format. Unpack the file +and save it locally, which unpacks to a single ``owncloud`` folder containing all ownCloud files. Place this in your Web root, typically ``C:\inetpub\wwwroot\``, so you have ``C:\inetpub\wwwroot\owncloud``. Set permissions on ``C:\inetpub\wwwroot\owncloud`` so that your IIS user has read-write access. diff --git a/admin_manual/installation/windows_installation.rst b/admin_manual/installation/windows_installation.rst index 7f2e44e35..60677cbea 100644 --- a/admin_manual/installation/windows_installation.rst +++ b/admin_manual/installation/windows_installation.rst @@ -14,7 +14,7 @@ Installation on Windows 7 and Windows Server 2008 Programming Interface (ISAPI). For these reasons, while ownCloud server will run on Windows, it is - not recommended at this time. + not recommended and not supported. .. note:: You must move the data directory outside of your public root (See advanced installation settings) @@ -234,12 +234,9 @@ Installing ownCloud ~~~~~~~~~~~~~~~~~~~ 1. Download the latest version of ownCloud from http://owncloud.org/download. - The file is downloaded in tar.bz2 format. + You may download the archive in either tar.bz2 or zip format. -2. Unzip the file and save it locally. - - .. note:: You can use jZip for a free utility (like Peazip) to unzip the - file. +2. Unpack the file and save it locally. 3. Copy the file to your ``wwwroot`` directory (for example, **C:\\inetpub\\wwwroot**). @@ -350,4 +347,4 @@ To modify the IIS Manager: You should now have ownCloud configured and ready for use. -.. _PHP For Windows: http://windows.php.net/download/ +.. _PHP For Windows: http://windows.php.net/download/ \ No newline at end of file