Skip to content

Commit

Permalink
update nginx 1.21.0 & reverse ImageMagick6 obsoleting in 123.08stable
Browse files Browse the repository at this point in the history 
- update nginx 1.21.0 mainline default & adjust default nginx vhost templates
- reverse the change for CentOS 7 systems for REMI YUM repo ImageMagick6 to ImageMagick package name change Beta Branch - Update REMI YUM ImageMagick6 package name obsoleting in 123.09beta01 back to using ImageMagick6 package naming scheme to be able to access ImageMagick 6.9.12.* versions. Seems REMI switched back to ImageMagick6 package names to be able to move and upgrade beyond CentOS 7.8+ system ImageMagick 6.9.11.x versions to newer ImageMacgik 6.9.12.x versions again.
  • Loading branch information
@centminmod
centminmod committed May 26, 2021
1 parent 180bd63 commit 3dd0c4c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions centmin.sh
View file
Expand Up @@ -19,11 +19,11 @@ branchname='123.08stable'
SCRIPT_MAJORVER='1.2.3'
SCRIPT_MINORVER='08'
SCRIPT_VERSION="${SCRIPT_MAJORVER}-eva2000.${SCRIPT_MINORVER}"
SCRIPT_DATE='31/07/2015'
SCRIPT_DATE='26/05/2021'
SCRIPT_AUTHOR='eva2000 (vbtechsupport.com)'
SCRIPT_MODIFICATION_AUTHOR='eva2000 (vbtechsupport.com)'
SCRIPT_URL='http://centminmod.com'
COPYRIGHT="Copyright 2011-2019 CentminMod.com"
COPYRIGHT="Copyright 2011-2021 CentminMod.com"
DISCLAIMER='This software is provided "as is" in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.'

#####################################################
Expand Down Expand Up @@ -386,7 +386,7 @@ MYSQL_INSTALL=n # Install official Oracle MySQL Server (MariaDB alt
SENDMAIL_INSTALL=n # Install Sendmail (and mailx) set to y and POSTFIX_INSTALL=n for sendmail
POSTFIX_INSTALL=y # Install Postfix (and mailx) set to n and SENDMAIL_INSTALL=y for sendmail
# Nginx
NGINX_VERSION='1.17.10' # Use this version of Nginx
NGINX_VERSION='1.21.0' # Use this version of Nginx
NGINX_VHOSTSSL='y' # enable centmin.sh menu 2 prompt to create self signed SSL vhost 2nd vhost conf
NGINXBACKUP='y'
NGINXDIR='/usr/local/nginx'
Expand Down
10 changes: 5 additions & 5 deletions inc/imagick_install.inc
View file
Expand Up @@ -46,9 +46,9 @@ checkimagicksys() {
yum clean all >/dev/null 2>&1
if [[ "$CENTOS_SEVEN" = '7' && "$(rpm -qa libwebp-devel)" ]]; then
yum -y swap libwebp-devel libwebp7-devel --enablerepo=remi
time yum -y install ImageMagick-devel ImageMagick-c++-devel --enablerepo=remi${DISABLEREPO_DNF} --disableplugin=priorities${VERSIONLOCK_REPO}
time yum -y install ImageMagick6-devel ImageMagick6-c++-devel --enablerepo=remi${DISABLEREPO_DNF} --disableplugin=priorities${VERSIONLOCK_REPO}
fi
yum -y update ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel --enablerepo=remi --disableplugin=priorities
yum -y update ImageMagick6 ImageMagick6-devel ImageMagick6-c++ ImageMagick6-c++-devel --enablerepo=remi --disableplugin=priorities
fi
else
if [[ "$CENTOS_SIX" = '6' ]]; then
Expand All @@ -60,7 +60,7 @@ checkimagicksys() {
if [[ "$(rpm -qa libwebp-devel)" ]]; then
yum -y swap libwebp-devel libwebp7-devel --enablerepo=remi
fi
yum -y install ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel --enablerepo=remi --disableplugin=priorities
yum -y install ImageMagick6 ImageMagick6-devel ImageMagick6-c++ ImageMagick6-c++-devel --enablerepo=remi --disableplugin=priorities
fi
fi
elif [ ! -f /etc/yum.repos.d/remi.repo ]; then
Expand Down Expand Up @@ -92,7 +92,7 @@ checkimagicksys() {
if [[ "$(rpm -qa libwebp-devel)" ]]; then
yum -y swap libwebp-devel libwebp7-devel --enablerepo=remi
fi
yum -y install ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel --enablerepo=remi --disableplugin=priorities
yum -y install ImageMagick6 ImageMagick6-devel ImageMagick6-c++ ImageMagick6-c++-devel --enablerepo=remi --disableplugin=priorities
fi
echo
else
Expand All @@ -113,7 +113,7 @@ checkimagicksys() {
if [[ "$(rpm -qa libwebp-devel)" ]]; then
yum -y swap libwebp-devel libwebp7-devel --enablerepo=remi
fi
yum -y install ImageMagick ImageMagick-devel ImageMagick-c++ ImageMagick-c++-devel --enablerepo=remi --disableplugin=priorities
yum -y install ImageMagick6 ImageMagick6-devel ImageMagick6-c++ ImageMagick6-c++-devel --enablerepo=remi --disableplugin=priorities
fi
fi
fi
Expand Down
12 changes: 6 additions & 6 deletions inc/nginx_addvhost.inc
View file
Expand Up @@ -356,9 +356,9 @@ server {
root /home/nginx/domains/$vhostname/public;

# prevent access to ./directories and files
location ~ (?:^|/)\. {
deny all;
}
# location ~ (?:^|/)\. {
# deny all;
# }

location / {

Expand Down Expand Up @@ -418,9 +418,9 @@ server {
root /home/nginx/domains/$vhostname/public;

# prevent access to ./directories and files
location ~ (?:^|/)\. {
deny all;
}
# location ~ (?:^|/)\. {
# deny all;
# }

location / {

Expand Down
2 changes: 1 addition & 1 deletion inc/nginx_configure.inc
View file
Expand Up @@ -507,7 +507,7 @@ fi
# http://nginx.org/en/docs/stream/ngx_stream_core_module.html
NGXINSTALL_VER=$(echo $NGINX_VERSION | cut -d . -f1,2)
NGXUPGRADE_VER=$(echo $ngver | cut -d . -f1,2)
if [[ "$ngver" && "$NGXUPGRADE_VER" = '1.9' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.10' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.11' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.12' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.13' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.14' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.15' ]]; then
if [[ "$ngver" && "$NGXUPGRADE_VER" = '1.9' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.10' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.11' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.12' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.13' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.14' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.15' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.16' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.17' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.18' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.19' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.20' ]] || [[ "$ngver" && "$NGXUPGRADE_VER" = '1.21' ]]; then
if [[ "$NGINX_STREAM" = [yY] ]]; then
STREAM=' --with-stream --with-stream_ssl_module'
else
Expand Down
2 changes: 1 addition & 1 deletion versions.txt
View file
@@ -1,5 +1,5 @@
NSD_VERSION='3.2.18'
NGINX_VERSION='1.17.10'
NGINX_VERSION='1.21.0'
NGXPGSPEED_VER='1.9.32.4-beta'
NGINX_PAGESPEEDPSOL_VER='1.9.32.4'
NGINX_EXTWEBDAVVER='0.0.3'
Expand Down

0 comments on commit 3dd0c4c

Please sign in to comment.