Skip to content

Commit

Permalink
Merge pull request #25 from sphen13/mcrypt_removal
Browse files Browse the repository at this point in the history
mcrypt removal
  • Loading branch information
sphen13 authored Aug 10, 2018
2 parents 7111c4b + 81504eb commit 21b53e6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ RUN apt-get update && \
php-mysql \
php \
libapache2-mod-php \
php-mcrypt \
php-mysql \
inoticoming \
supervisor \
Expand Down
2 changes: 1 addition & 1 deletion Server/server-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ if [[ -z ${IN_DOCKER} ]]; then
apt-get update
sudo debconf-set-selections <<< "mysql-server mysql-server/root_password password $mysqlRootPass"
sudo debconf-set-selections <<< "mysql-server mysql-server/root_password_again password $mysqlRootPass"
apt-get -y install apache2 fail2ban mysql-server php-mysql php libapache2-mod-php php-mcrypt php-mysql inoticoming swaks curl
apt-get -y install apache2 fail2ban mysql-server php-mysql php libapache2-mod-php php-mysql inoticoming swaks curl
fi

## setup user accounts/folders
Expand Down

0 comments on commit 21b53e6

Please sign in to comment.