You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2019/06/10 15:22:11 UTC
svn commit: r1860955 -
/vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.5to2.5.1.mdtext
Author: jfthomps
Date: Mon Jun 10 15:22:11 2019
New Revision: 1860955
URL: http://svn.apache.org/viewvc?rev=1860955&view=rev
Log:
updated 2.4.2 to 2.5 and 2.5 to 2.5.1; updated how conf.php is changed; removed updating secrets.php
Modified:
vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.5to2.5.1.mdtext
Modified: vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.5to2.5.1.mdtext
URL: http://svn.apache.org/viewvc/vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.5to2.5.1.mdtext?rev=1860955&r1=1860954&r2=1860955&view=diff
==============================================================================
--- vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.5to2.5.1.mdtext (original)
+++ vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.5to2.5.1.mdtext Mon Jun 10 15:22:11 2019
@@ -1,4 +1,4 @@
-Title: Upgrade From 2.4.2 to 2.5
+Title: Upgrade From 2.5 to 2.5.1
Notice: Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -18,20 +18,20 @@ Notice: Licensed to the Apache Softwa
# Scripted Upgrade
-VCL 2.5 is the second release to include an upgrade script. All you need to
+VCL 2.5.1 includes an upgrade script. All you need to
upgrade VCL is the script. It will download and validate the VCL software and
then upgrade your system. The script can be used to upgrade all three parts of
VCL (database, web portal, and management node) or to upgrade each part
individually. It works for upgrading from any previous version of Apache VCL.
-[Download Upgrade Script (vcl-upgrade.sh)](https://www.apache.org/dist/vcl/2.5/vcl-upgrade.sh)
+[Download Upgrade Script (vcl-upgrade.sh)](https://www.apache.org/dist/vcl/2.5.1/vcl-upgrade.sh)
:::BashLexer
- wget https://www.apache.org/dist/vcl/2.5/vcl-upgrade.sh.sha1
- sha1sum -c vcl-upgrade.sh.sha1
+ wget https://www.apache.org/dist/vcl/2.5.1/vcl-upgrade.sh.sha512
+ sha512sum -c vcl-upgrade.sh.sha512
wget https://www.apache.org/dist/vcl/KEYS
gpg --import KEYS
- wget https://www.apache.org/dist/vcl/2.5/vcl-upgrade.sh.asc
+ wget https://www.apache.org/dist/vcl/2.5.1/vcl-upgrade.sh.asc
gpg --verify vcl-upgrade.sh.asc
Running the upgrade script with no arguments will step you through upgrading
@@ -65,13 +65,13 @@ for the code to run.
# Manual Upgrade Instructions
-These instructions explain how to upgrade from VCL 2.4.2 to VCL 2.5. Please note
-it only applies for the upgrade from 2.4.2 to 2.5, this may or may not work for other
+These instructions explain how to upgrade from VCL 2.5 to VCL 2.5.1. Please note
+it only applies for the upgrade from 2.5 to 2.5.1, this may or may not work for other
versions.
**The basic steps that will be performed**
- - Download and Extract 2.5 code
+ - Download and Extract 2.5.1 code
- Shutdown httpd and vcld services
- Create backup of vcl database
- Update mysql schema
@@ -83,11 +83,11 @@ versions.
### Upgrade steps
1. follow instructions on the [VCL download](http://vcl.apache.org/downloads/download.cgi)
-page to download and verify apache-VCL-2.5.tar.bz2 and put in in /root
-2. **extract VCL 2.5 code**
+page to download and verify apache-VCL-2.5.1.tar.bz2 and put in in /root
+2. **extract VCL 2.5.1 code**
:::BashLexer
- tar xf apache-VCL-2.5.tar.bz2
+ tar xf apache-VCL-2.5.1.tar.bz2
3. **Shutdown** the httpd and vcld services
@@ -99,47 +99,47 @@ page to download and verify apache-VCL-2
necessary.
:::BashLexer
- mysqldump vcl > ~/vcl-pre2.5-upgrade.sql
+ mysqldump vcl > ~/vcl-pre2.5.1-upgrade.sql
5. This step **updates the database** schema.
:::BashLexer
- mysql vcl < /root/apache-VCL-2.5/mysql/update-vcl.sql
+ mysql vcl < /root/apache-VCL-2.5.1/mysql/update-vcl.sql
6. **Possibly move old web code**. If /var/www/html/vcl **is a directory**, rename it to
-/var/www/html/vcl-2.4.2. These instructions assume that you installed the
+/var/www/html/vcl-2.5. These instructions assume that you installed the
VCL web code at /var/www/html/vcl. If you installed it elsewhere, replace
/var/www/html/vcl with your vcl web root.
:::BashLexer
- mv /var/www/html/vcl /var/www/html/vcl-2.4.2
+ mv /var/www/html/vcl /var/www/html/vcl-2.5
7. **Disable access** to the old web code
:::BashLexer
- echo "Require all denied" > /var/www/html/vcl-2.4.2/.htaccess
+ echo "Require all denied" > /var/www/html/vcl-2.5/.htaccess
7. **Copy the new code** in place
:::BashLexer
- cp -ar /root/apache-VCL-2.5/web /var/www/html/vcl-2.5
- ln -sfn /var/www/html/vcl-2.5 /var/www/html/vcl
+ cp -ar /root/apache-VCL-2.5.1/web /var/www/html/vcl-2.5.1
+ ln -sfn /var/www/html/vcl-2.5.1 /var/www/html/vcl
-8. **Copy your 2.4.2 config files**
+8. **Copy your 2.5 config files**
:::BashLexer
- cd /var/www/html/vcl-2.4.2/.ht-inc
+ cd /var/www/html/vcl-2.5/.ht-inc
cp conf.php secrets.php pubkey.pem keys.pem /var/www/html/vcl/.ht-inc
8. **Set SELinux context** If you are using SELinux, set the correct context:
:::BashLexer
- chcon -R -t httpd_sys_content_t /var/www/html/vcl-2.5
- chcon -t httpd_sys_rw_content_t /var/www/html/vcl-2.5/.ht-inc/maintenance
- chcon -t httpd_sys_rw_content_t /var/www/html/vcl-2.5/.ht-inc/cryptkey
+ chcon -R -t httpd_sys_content_t /var/www/html/vcl-2.5.1
+ chcon -t httpd_sys_rw_content_t /var/www/html/vcl-2.5.1/.ht-inc/maintenance
+ chcon -t httpd_sys_rw_content_t /var/www/html/vcl-2.5.1/.ht-inc/cryptkey
-9. **Update conf.php**. The following item needs to be removed from the conf.php
-file:
+9. **Update conf.php**. The following item needs to be added to the conf.php
+file. (It is located above the define line for BASEURL in the conf-default.php file):
:::BashLexer
(don't forget to edit conf.php in the **new** location)
@@ -147,18 +147,7 @@ file:
<br>
:::PhpLexer
- define("MAXVMLIMIT", "100");
-
-9. **Update secrets.php** $cryptkey in secrets.php needs to be generated
-using openssl. Generate the value and set it in secrets.php:
-
- :::BashLexer
- openssl rand 32 | base64
- vim /var/www/html/vcl/.ht-inc/secrets.php
-<br>
-
- :::PhpLexer
- $cryptkey = 'xxxxxxxxxxxxxxxxxxxxxxxxx'; # set this to output of "openssl rand 32 | base64"
+ define("SSLOFFLOAD", 0);
9. **Make the maintenance and cryptkey directories writable** by the web server user. Normally this is
the apache user, if using a different user change below command accordingly.
@@ -180,25 +169,25 @@ I.e.
https://your.site.url/vcl/testsetup.php
13. **Copy old management node code** If /usr/local/vcl is a directory, copy it to
-/usr/local/vcl-2.4.2, rename /usr/local/vcl to /usr/local/vcl-2.5, and create a symlink.
-If /usr/local/vcl is a symlink to vcl-2.4.2, copy /usr/local/vcl-2.4.2 to /usr/local/vcl-2.5
+/usr/local/vcl-2.5, rename /usr/local/vcl to /usr/local/vcl-2.5.1, and create a symlink.
+If /usr/local/vcl is a symlink to vcl-2.5, copy /usr/local/vcl-2.5 to /usr/local/vcl-2.5.1
and update the symlink.
:::BashLexer
(for directory)
- cp -ar /usr/local/vcl /usr/local/vcl-2.4.2
- mv /usr/local/vcl /usr/local/vcl-2.5
- ln -s /usr/local/vcl-2.5 /usr/local/vcl
+ cp -ar /usr/local/vcl /usr/local/vcl-2.5
+ mv /usr/local/vcl /usr/local/vcl-2.5.1
+ ln -s /usr/local/vcl-2.5.1 /usr/local/vcl
<br>
:::BashLexer
(for symlink)
- cp -ar /usr/local/vcl-2.4.2 /usr/local/vcl-2.5
- ln -sfn /usr/local/vcl-2.5 /usr/local/vcl
+ cp -ar /usr/local/vcl-2.5 /usr/local/vcl-2.5.1
+ ln -sfn /usr/local/vcl-2.5.1 /usr/local/vcl
13. **Copy new code in place** Copy the new management node code over the old code:
- /bin/cp -ar /root/apache-VCL-2.5/managementnode/* /usr/local/vcl-2.5
+ /bin/cp -ar /root/apache-VCL-2.5.1/managementnode/* /usr/local/vcl-2.5.1
14. **Run install_perl_libs.pl** to add any new perl library requirements: