Skip to content

Commit b238991

Browse files
limmikelimmike
authored
bug fixes
1 parent 9675aeb commit b238991

3 files changed

+55
-6
lines changed

‎AmazonLinux-2-LAMP-server.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1426,7 +1426,7 @@ Resources:
14261426
00_dcv_install:
14271427
files:
14281428
"/root/install-dcv.sh":
1429-
content: |
1429+
content: !Sub |
14301430
#!/bin/bash
14311431
mkdir -p /tmp/cfn
14321432
cd /tmp/cfn
@@ -1676,7 +1676,7 @@ Resources:
16761676
echo "sudo /opt/certbot/bin/pip install --upgrade certbot-apache" >> /home/ec2-user/update-certbot
16771677
yum install -q -y httpd mod_ssl mod_fcgid
16781678
systemctl enable httpd
1679-
cp /etc/httpd/conf.modules.d/00-mpm.conf /etc/httpd/conf.modules.d/00-mpm.conf."`date +"%Y-%m-%d"`"
1679+
cp /etc/httpd/conf.modules.d/00-mpm.conf /etc/httpd/conf.modules.d/00-mpm.conf."`date +"%Y-%m-%d"`"
16801680
# Apache MPM event: https://httpd.apache.org/docs/2.4/mod/event.html
16811681
sed -i "s/^LoadModule mpm_prefork_module/#&/" /etc/httpd/conf.modules.d/00-mpm.conf
16821682
sed -i "/^#LoadModule mpm_event_module/a LoadModule mpm_event_module modules/mod_mpm_event.so" /etc/httpd/conf.modules.d/00-mpm.conf
@@ -1685,7 +1685,7 @@ Resources:
16851685
sed -i "s/^SSLProtocol/#&/" /etc/httpd/conf.d/ssl.conf
16861686
sed -i "/^#SSLProtocol/a SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1" /etc/httpd/conf.d/ssl.conf
16871687
sed -i "s/^SSLCipherSuite/#&/" /etc/httpd/conf.d/ssl.conf
1688-
sed -i "/^#SSLCipherSuite RC4/a SSLCipherSuite ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256" /etc/httpd/conf.d/ssl.conf
1688+
ed -i "/^#SSLCipherSuite RC4/a SSLCipherSuite ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256" /etc/httpd/conf.d/ssl.conf
16891689
# virtual host: for Certbot
16901690
cat << EoF > /etc/httpd/conf.d/www.conf
16911691
<VirtualHost *:80>

‎AmazonLinux-2023-LAMP-server.yaml

+20-1
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,26 @@ Resources:
14531453
echo 'extension=ssh2.so' > /etc/php.d/25-ssh2.ini
14541454
fi
14551455
fi
1456-
1456+
1457+
dnf install -q -y php-odbc unixODBC-devel
1458+
# Microsoft ODBC driver for SQL Server : https://learn.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server
1459+
curl https://packages.microsoft.com/config/rhel/9/prod.repo | tee /etc/yum.repos.d/mssql-release.repo
1460+
dnf remove -q -y unixODBC-utf16 unixODBC-utf16-devel #to avoid conflicts
1461+
ACCEPT_EULA=Y dnf install -q -y msodbcsql18
1462+
ACCEPT_EULA=Y dnf install -q -y mssql-tools18
1463+
echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> /root/.bashrc
1464+
echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> /home/ec2-user/.bashrc
1465+
1466+
# Microsoft Drivers for PHP for SQL Server: https://learn.microsoft.com/en-us/sql/connect/php/microsoft-php-driver-for-sql-server
1467+
yes 'no' | pecl install sqlsrv
1468+
if [ $? -eq 0 ]; then
1469+
echo 'extension=sqlsrv.so' > /etc/php.d/20-sqlsrv.ini
1470+
fi
1471+
yes 'no' | pecl install pdo_sqlsrv
1472+
if [ $? -eq 0 ]; then
1473+
echo 'extension=pdo_sqlsrv.so' > /etc/php.d/30-pdo_sqlsrv.ini
1474+
fi
1475+
14571476
cd /tmp/cfn
14581477
14591478
# https://github.com/amazonlinux/amazon-linux-2023/issues/371

‎UbuntuLinux-LAMP-server.yaml

+32-2
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ Resources:
14011401
00_dcv_install:
14021402
files:
14031403
"/root/install-dcv.sh":
1404-
content: |
1404+
content: !Sub |
14051405
#!/bin/bash
14061406
mkdir -p /tmp/cfn
14071407
cd /tmp/cfn
@@ -1486,7 +1486,6 @@ Resources:
14861486
# PHP from Ondrej repo: https://deb.sury.org/
14871487
apt-get install -q -y ca-certificates apt-transport-https software-properties-common lsb-release
14881488
add-apt-repository -y ppa:ondrej/php
1489-
esac
14901489
14911490
# PHP install
14921491
apt-get install -q -y ${phpVersion}
@@ -1574,6 +1573,37 @@ Resources:
15741573
fi
15751574
cd /tmp/cfn
15761575
1576+
apt-get install -q -y ${phpVersion}-odbc unixodbc-dev
1577+
# ODBC driver for SQL Server: https://learn.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server
1578+
case $(lsb_release -rs) in
1579+
22*)
1580+
curl https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc
1581+
;;
1582+
*)
1583+
curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg
1584+
;;
1585+
esac
1586+
curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | tee /etc/apt/sources.list.d/mssql-release.list
1587+
apt-get update
1588+
ACCEPT_EULA=Y apt-get install -y msodbcsql18
1589+
ACCEPT_EULA=Y apt-get install -y mssql-tools18
1590+
echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> /root/.bashrc
1591+
echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> /home/ubuntu/.bashrc
1592+
1593+
# Microsoft Drivers for PHP for SQL Server: https://learn.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac
1594+
yes 'no' | pecl install sqlsrv
1595+
if [ $? -eq 0 ]; then
1596+
echo 'extension=sqlsrv.so' > /etc/php/$PHP_VERSION/mods-available/sqlsrv.ini
1597+
ln -s /etc/php/$PHP_VERSION/mods-available/sqlsrv.ini /etc/php/$PHP_VERSION/fpm/conf.d/20-sqlsrv.ini
1598+
ln -s /etc/php/$PHP_VERSION/mods-available/sqlsrv.ini /etc/php/$PHP_VERSION/cli/conf.d/20-sqlsrv.ini
1599+
fi
1600+
yes 'no' | pecl install pdo_sqlsrv
1601+
if [ $? -eq 0 ]; then
1602+
echo 'extension=pdo_sqlsrv.so' > /etc/php/$PHP_VERSION/mods-available/pdo_sqlsrv.ini
1603+
ln -s /etc/php/$PHP_VERSION/mods-available/pdo_sqlsrv.ini /etc/php/$PHP_VERSION/fpm/conf.d/30-pdo_sqlsrv.ini
1604+
ln -s /etc/php/$PHP_VERSION/mods-available/pdo_sqlsrv.ini /etc/php/$PHP_VERSION/cli/conf.d/30-pdo_sqlsrv.ini
1605+
fi
1606+
15771607
# Composer: https://getcomposer.org/download/
15781608
apt-get install -q -y composer
15791609

0 commit comments

Comments
 (0)