oschaaf closed pull request #48: incompatible with mod_ruid2 URL: https://github.com/apache/incubator-pagespeed-cpanel/pull/48
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/EA4/SPECS/mod_pagespeed.spec b/EA4/SPECS/mod_pagespeed.spec index 56f9a01..8e9d35a 100644 --- a/EA4/SPECS/mod_pagespeed.spec +++ b/EA4/SPECS/mod_pagespeed.spec @@ -11,6 +11,7 @@ URL: http://modpagespeed.com/ Source0: 456_pagespeed.conf BuildRequires: wget BuildRequires: cpio +Conflicts: %{ns_name}-mod_ruid2 Requires(pre): ea-apache24 ea-apache24-mod_version # Suppres auto-provides for module DSO @@ -57,6 +58,9 @@ rm -rf %{buildroot} %config(noreplace) %{_httpd_modconfdir}/*.conf %changelog +* Mon Jun 28 2016 Prajith <[email protected]> - 1.9-3 +- Added mod_ruid2 as conflict package + * Thu Dec 17 2015 Prajith <[email protected]> - 1.9-2 - Change version and release to 'latest' and 'stable' - update license to ' Apache Software License' diff --git a/EA4/ea-apache24-mod_pagespeed-latest-stable.src.rpm b/EA4/ea-apache24-mod_pagespeed-latest-stable.src.rpm index 7baa864..1006160 100644 Binary files a/EA4/ea-apache24-mod_pagespeed-latest-stable.src.rpm and b/EA4/ea-apache24-mod_pagespeed-latest-stable.src.rpm differ diff --git a/Easy/Speed.pm b/Easy/Speed.pm index 4c2d762..2d0e39d 100755 --- a/Easy/Speed.pm +++ b/Easy/Speed.pm @@ -7,7 +7,7 @@ our $easyconfig = { 'hastargz' => 1, 'ensurepkg' => [qw{rpm cpio}], 'depends' => { 'optmods' => { 'Cpanel::Easy::Apache::Deflate' => 1, 'Cpanel::Easy::Apache::Version' => 0, }, }, - 'implies' => { 'Cpanel::Easy::Apache::Deflate' => 1, 'Cpanel::Easy::Apache::Version' => 0, }, + 'implies' => { 'Cpanel::Easy::Apache::Deflate' => 1, 'Cpanel::Easy::Apache::Version' => 0, 'Cpanel::Easy::ModRuid2' => 0, }, 'src_cd2' => 'pagespeed/', 'when_i_am_off' => sub { @@ -29,8 +29,8 @@ our $easyconfig = { # Apache 2.4 because cPanel use './configure --enable-modules=none'. my ( $easy, $self_hr, $profile_hr ) = @_; if ( $profile_hr->{'Apache'}{'version'} eq '2_4' ) { - $self_hr->{'implies'} = { 'Cpanel::Easy::Apache::Deflate' => 1, 'Cpanel::Easy::Apache::Version' => 1, }; - $self_hr->{'depends'} = { 'optmods' => { 'Cpanel::Easy::Apache::Deflate' => 1, 'Cpanel::Easy::Apache::Version' => 1, }, }, + $self_hr->{'implies'} = { 'Cpanel::Easy::Apache::Deflate' => 1, 'Cpanel::Easy::Apache::Version' => 1, 'Cpanel::Easy::ModRuid2' => 0, }; + $self_hr->{'depends'} = { 'optmods' => { 'Cpanel::Easy::Apache::Deflate' => 1, 'Cpanel::Easy::Apache::Version' => 1, 'Cpanel::Easy::ModRuid2' => 0, }, }, } }, diff --git a/LICENSE b/LICENSE index 266711a..47d7f26 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2014-2015 Prajith && Ndimensionz +Copyright (C) 2016 Prajith && Ndimensionz http://www.prajith.in/install-mod_pagespeed-in-whmcpanel-using-easyapache/ http://ndimensionz.com diff --git a/README.md b/README.md index c5fcd6e..023f7e4 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,16 @@ A custom module for CPanel WHM using CPanel Easy Framework - allows easy install ## Installation instructions -If you are using EasyApache4, please follow the below steps to install mod_pagespeed. +# If you are using EasyApache4, please follow the below steps to install mod_pagespeed. ``` $> yum install rpm-build cpio ea-apache24-mod_version -$> wget https://github.com/Prajithp/cpanel/raw/master/EA4/ea-apache24-mod_pagespeed-1.9-32.11.src.rpm -$> rpmbuild --rebuild ea-apache24-mod_pagespeed-1.9-32.11.src.rpm -$> rpm -ivh /root/rpmbuild/RPMS/x86_64/ea-apache24-mod_pagespeed-1.9-32.11.x86_64.rpm +$> wget https://github.com/pagespeed/cpanel/raw/master/EA4/ea-apache24-mod_pagespeed-latest-stable.src.rpm +$> rpmbuild --rebuild ea-apache24-mod_pagespeed-latest-stable.src.rpm +$> rpm -ivh /root/rpmbuild/RPMS/x86_64/ea-apache24-mod_pagespeed*.rpm $> /etc/init.d/httpd restart ``` +# Below steps only for EA3 users. 1. Clone the installation scripts onto your CPanel server: ```bash $> /usr/local/cpanel/3rdparty/bin/git clone https://github.com/pagespeed/cpanel.git /tmp/pagespeed/ ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
