From ebbec4f5617ac1a3b237ee368778980924607707 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 17 Jun 2013 10:20:46 -0500 Subject: [PATCH 1/4] Removed double iconv in dependencies list --- documentation/installation_guide.html | 1 - 1 file changed, 1 deletion(-) diff --git a/documentation/installation_guide.html b/documentation/installation_guide.html index 23da18f1ec..4ec0161dc3 100644 --- a/documentation/installation_guide.html +++ b/documentation/installation_guide.html @@ -315,7 +315,6 @@ date.timezone = 'America/New_York'
  • php5-mbstring
  • php5-intl
  • php5-curl
    • -
  • php5-iconv
  • php5-xsl
  • php5-ldap
  • php5-xapian
    • From 487813a18b1e52d18150c5dcc96f6d9a55e4075c Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 17 Jun 2013 10:38:38 -0500 Subject: [PATCH 2/4] Added brackets around Chamilo dir to try and be a little more explicit --- main/install/install.lib.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 71a7eece67..f8fbaec3b8 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -1264,23 +1264,27 @@ function display_requirements($app, $installType) $html .= ' - + - + - + - + - + + + + + From e92eb5800b540594fd28a706065a3c0768b68ece Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 17 Jun 2013 10:43:14 -0500 Subject: [PATCH 3/4] Updated installation guide for new directories --- documentation/installation_guide.html | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/documentation/installation_guide.html b/documentation/installation_guide.html index 4ec0161dc3..f294035486 100644 --- a/documentation/installation_guide.html +++ b/documentation/installation_guide.html @@ -145,12 +145,11 @@ values. Consider changing the admin password to remember it.  The following directories need to be readable, writeable and executable by your web server. This usually requires no specific action on Windows servers, but will require a "chmod" under Linux and Mac. See instructions below.
    Replace [chamilo] with the directory where your Chamilo installation is located):
      -
    • [chamilo]/main/inc/conf/
      • -
    • [chamilo]/main/upload/users/
      • -
    • [chamilo]/main/default_course_document/images/
      • -
    • [chamilo]/archive/
      • -
    • [chamilo]/courses/
      • -
    • [chamilo]/home/
      • +
    • [chamilo]/config
      • +
    • [chamilo]/data
      • +
    • [chamilo]/logs
      • +
    • [chamilo]/temp
      • +
    • [chamilo]/main/default_course_document/images
    Optionally, you can do the same to the following directories if you want to enable CSS styles package upload and sub-language definition: @@ -177,7 +176,7 @@ right-clicking on them).

    The following directory needs to be readable and writeable for the web browser only during the installation process:

      -
    • chamilo/main/inc/conf/ (if present)
      • +
    • [chamilo]/config (if present)

    On Linux, Mac OS X and BSD operating systems you can use the chmod @@ -205,7 +204,7 @@ in production), the login and password for MySQL will probably remain empty.

  • Protect your configuration directory: make sure no one (but you) can overwrite it. You can find the config directory in -(chamilo folder)/main/inc/conf. +(chamilo folder)/config Make it read-only (windows/xwindows: right-click the file to edit the properties. linux/bsd/macosx: use the chmod 0555 command). The config file is created by your web server (Apache + PHP, usually) so you may @@ -456,12 +455,11 @@ choose "Configure the homepage" in the Chamilo administration section.

    The following directories need to be readable, writeable and executable for the web server:
      -
    • chamilo/main/inc/conf/
      • -
    • chamilo/main/upload/users/
      • +
    • chamilo/config
      • +
    • chamilo/data
      • +
    • chamilo/logs
      • +
    • chamilo/temp
    • chamilo/main/default_course_document/
      • -
    • chamilo/archive/
      • -
    • chamilo/courses/
      • -
    • chamilo/home/
    On Linux, Mac OS X and BSD operating systems you can quick-fix this using the From b868b932ad78b53bc263bda6a3f9490efca6d5bc Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 17 Jun 2013 11:05:48 -0500 Subject: [PATCH 4/4] Added placeholder in twig dir to avoid weird failing first-script-after-install bug --- .gitignore | 1 + temp/twig/PLACEHOLDER | 0 2 files changed, 1 insertion(+) create mode 100644 temp/twig/PLACEHOLDER diff --git a/.gitignore b/.gitignore index c618820694..161ae6b80f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ config/portfolio.conf.php config/profile.conf.php temp/* +!temp/twig/PLACEHOLDER data/* !data/upload/users logs/* diff --git a/temp/twig/PLACEHOLDER b/temp/twig/PLACEHOLDER new file mode 100644 index 0000000000..e69de29bb2
    • chamilo/config[chamilo]/config '.check_writable_root_path('config/').'
    chamilo/data[chamilo]/data '.check_writable_root_path('data').'
    chamilo/logs[chamilo]/logs '.check_writable_root_path('logs').'
    chamilo/temp[chamilo]/temp '.check_writable_root_path('temp').'
    chamilo/main/default_course_document/images/[chamilo]/temp/twig'.check_writable_root_path('temp').'
    [chamilo]/main/default_course_document/images/ '.check_writable('default_course_document/images/').'