Skip to content
Snippets Groups Projects
Unverified Commit a55ecbf1 authored by David Beniamine's avatar David Beniamine
Browse files

Compatibility with nginx (need test)

parent b5cb2fcf
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 113 additions and 85 deletions
template_ssl.conf → etc/apache2/sites-available/ssl.conf
+ 0
− 0
View file @ a55ecbf1
File moved
initInstall.sh
+ 1
− 1
View file @ a55ecbf1
......@@ -52,7 +52,6 @@ DEBIAN_FRONTEND='noninteractive' apt-get -qq install \
debian-goodies \
fail2ban \
git \
libapache2-mod-php5 \
lm-sensors \
make \
ntp \
......@@ -71,6 +70,7 @@ DEBIAN_FRONTEND='noninteractive' apt-get -qq install \
ufw \
unattended-upgrades \
vim-nox \
${WEB_SERVER_PACKAGES} \
wget
# Configure UFW
......
installDolibarr.sh
+ 27
− 21
View file @ a55ecbf1
......@@ -103,45 +103,51 @@ else
fi
mount ${VERBOSE:+v} /usr/share/dolibarr/documents
echo "Set dolibarr's configuration file for apache 2"
echo "Set dolibarr's configuration file for ${WEB_SERVER}"
# Save last dolibarr-ssh.conf if exists
if [ -f /etc/apache2/sites-available/dolibarr-ssl.conf ]
if [ -f /etc/${WEB_SERVER}/sites-available/dolibarr-ssl.conf ]
then
echo "Dolibarr's apache configuration already exists"
echo "Dolibarr's ${WEB_SERVER} configuration already exists"
echo "Backup file is created at" \
"/etc/apache2/sites-available/${RUNNING_DATE_TIME}_dolibarr-ssl.conf"
"/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}_dolibarr-ssl.conf"
echo "cp ${VERBOSE:+-v} /etc/apache2/sites-available/dolibarr-ssl.conf" \
"/etc/apache2/sites-available/${RUNNING_DATE_TIME}_dolibarr-ssl.conf"
cp ${VERBOSE:+-v} /etc/apache2/sites-available/dolibarr-ssl.conf \
/etc/apache2/sites-available/${RUNNING_DATE_TIME}_dolibarr-ssl.conf
echo "cp ${VERBOSE:+-v} /etc/${WEB_SERVER}/sites-available/dolibarr-ssl.conf" \
"/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}_dolibarr-ssl.conf"
cp ${VERBOSE:+-v} /etc/${WEB_SERVER}/sites-available/dolibarr-ssl.conf \
/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}_dolibarr-ssl.conf
fi
sed "s/<+ServerAdmin+>/${DOLIBARR_CONFIG_ServerAdmin}/;
s/<+ServerName+>/${DOLIBARR_CONFIG_ServerName}/" \
${SCRIPT_DIRECTORY%%/}/template_dolibarr-ssl.conf > \
/etc/apache2/sites-available/dolibarr-ssl.conf
${SCRIPT_DIRECTORY%%/}/etc/${WEB_SERVER}/sites-available/dolibarr-ssl.conf > \
/etc/${WEB_SERVER}/sites-available/dolibarr-ssl.conf
# Set ssl.conf
if [ -f /etc/apache2/sites-available/ssl.conf ]
if [ -f /etc/${WEB_SERVER}/sites-available/ssl.conf ]
then
echo "Apache ssl configuration already exists"
echo "${WEB_SERVER} ssl configuration already exists"
echo "Backup file is created at " \
"/etc/apache2/sites-available/${RUNNING_DATE_TIME}-ssl.conf"
"/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}-ssl.conf"
echo "cp ${VERBOSE:+-v} /etc/apache2/sites-available/dolibarr-ssl.conf" \
"/etc/apache2/sites-available/${RUNNING_DATE_TIME}-ssl.conf"
cp ${VERBOSE:+-v} /etc/apache2/ssl.conf \
/etc/apache2/${RUNNING_DATE_TIME}-ssl.conf
echo "cp ${VERBOSE:+-v} /etc/${WEB_SERVER}/sites-available/dolibarr-ssl.conf" \
"/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}-ssl.conf"
cp ${VERBOSE:+-v} /etc/${WEB_SERVER}/ssl.conf \
/etc/${WEB_SERVER}/${RUNNING_DATE_TIME}-ssl.conf
fi
sed \
"s@<+SSLCertificateFile+>@${NEXTCLOUD_CONFIG_certificateFile:-<+SSLCertificateFile+>}@
s@<+SSLCertificateKeyFile+>@${NEXTCLOUD_CONFIG_certificateKeyFile:-<+SSLCertificateKeyFile+>}@" \
${SCRIPT_DIRECTORY%%/}/template_ssl.conf > \
/etc/apache2/ssl.conf
${SCRIPT_DIRECTORY%%/}/etc/${WEB_SERVER}/sites-available/ssl.conf > \
/etc/${WEB_SERVER}/ssl.conf
if [ ${WEB_SERVER} == "apache2" ]
then
a2ensite dolibarr-ssl.conf
apachectl configtest && apachectl restart || echo "Failed restartin apache"
else
ln -s /etc/nginx/sites-available/dolibarr-ssl.conf /etc/nginx/sites-enabled
systemctl restart nginx
fi
# Create dolibar database in mysql
echo "create dolibarr database"
......
installNextcloud.sh
+ 55
− 43
View file @ a55ecbf1
......@@ -39,7 +39,6 @@ cd $NEXTCLOUD_DIRECTORY_SOURCES
# 1. Download Nexcloud Package
DEBIAN_FRONTEND='noninteractive' apt-get update \
&& DEBIAN_FRONTEND='noninteractive' apt-get -qq install \
apache2 \
apg \
bzip2 \
gnupg2 \
......@@ -54,6 +53,7 @@ DEBIAN_FRONTEND='noninteractive' apt-get update \
sudo \
tar \
ufw \
${WEB_SERVER_PACKAGES} \
wget
if [ -d ${NEXTCLOUD_INSTALL_DIR} ]
......@@ -130,11 +130,17 @@ sed -i.bak -e 's/\(upload_max_filesize\).*/\1 16G/' \
-e 's/\(post_max_size\).*/\1 16G/' \
${NEXTCLOUD_INSTALL_DIR}.htaccess
for dir in apache2 cgi cli fpm
do
if [ -e /etc/php5/$dir/php.ini ]
then
# set max input time from 1 minute to 1 hour
# php timeout for large file
sed -i.bak -e 's/\(max_input_time =\).*/\1 3600/' \
-e 's/\(max_execution_time =\).*/\1 3600/' \
/etc/php5/apache2/php.ini
/etc/php5/$dir/php.ini
fi
done
echo "configure mysqld compatiblity to nextcloud"
# configure mysqld for nextcloud
......@@ -245,30 +251,30 @@ fi
. `pwd`/nextcloudStrongDirectoryPermissions.sh
if [ -f /etc/apache2/nextcloud-ssl.conf ]
if [ -f /etc/${WEB_SERVER}/nextcloud-ssl.conf ]
then
cp /etc/apache2/nextcloud-ssl.conf \
/etc/apache2/${RUNNING_DATE_TIME}_nextcloud-ssl.conf
cp /etc/${WEB_SERVER}/nextcloud-ssl.conf \
/etc/${WEB_SERVER}/${RUNNING_DATE_TIME}_nextcloud-ssl.conf
fi
if [ -f /etc/apache2/sites-available/ssl.conf ]
if [ -f /etc/${WEB_SERVER}/sites-available/ssl.conf ]
then
cp /etc/apache2/sites-available/ssl.conf /etc/apache2/sites-available/${RUNNING_DATE_TIME}_ssl.conf
cp /etc/${WEB_SERVER}/sites-available/ssl.conf /etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}_ssl.conf
fi
# Configure Apache for nextcloud
echo "Configure Apache nextcloud-ssl.conf"
echo "Configure ${WEB_SERVER} nextcloud-ssl.conf"
sed \
"s/<+NEXTCLOUD_CONFIG_ServerAdmin+>/${NEXTCLOUD_CONFIG_ServerAdmin}/;
s/<+NEXTCLOUD_CONFIG_ServerName+>/${NEXTCLOUD_CONFIG_ServerName}/" \
`pwd`/template_nextcloud-ssl.conf > \
/etc/apache2/sites-available/nextcloud-ssl.conf
`pwd`/etc/${WEB_SERVER}/sites-available/nextcloud-ssl.conf > \
/etc/${WEB_SERVER}/sites-available/nextcloud-ssl.conf
sed \
"s@<+SSLCertificateFile+>@${NEXTCLOUD_CONFIG_certificateFile:-<+SSLCertificateFile+>}@
s@<+SSLCertificateKeyFile+>@${NEXTCLOUD_CONFIG_certificateKeyFile:-<+SSLCertificateKeyFile+>}@" \
`pwd`/template_ssl.conf > \
/etc/apache2/ssl.conf
`pwd`/etc/${WEB_SERVER}/ssl.conf > \
/etc/${WEB_SERVER}/ssl.conf
#ln -s /etc/apache2/sites-available/nextcloud-ssl.conf \
......@@ -276,6 +282,8 @@ sed \
#echo "WARNING : SSLEngine is disabled : to enable modify file /etc/apache2/ssl.conf"
#echo "Configure Apache nextcloud-ssl.conf : terminated"
if [ ${WEB_SERVER} == "apache2" ]
then
echo "a2enmod rewrite"
a2enmod rewrite
echo "a2enmod rewrite : terminated"
......@@ -300,8 +308,12 @@ a2ensite nextcloud-ssl
echo "apachectl restart"
apachectl configtest && apachectl restart || echo "Failed restartin apache"
else
ln -s /etc/nginx/sites-available/nextcloud-ssl.conf /etc/nginx/sites-enabled/
systemctl restart nginx
fi
echo "Warning: ssl isn't properly activated, please run certbot then uncomment the contents of /etc/apache2/ssl.conf"
echo "Warning: ssl isn't properly activated, please run certbot then uncomment the contents of /etc/${WEB_SERVER}/ssl.conf"
line="*/15 * * * * php -f ${NEXTCLOUD_INSTALL_DIR}/cron.php"
echo "Adding crontab entry '$line' to www-data"
......
installTetrasBack.sh
+ 26
− 20
View file @ a55ecbf1
......@@ -38,42 +38,48 @@ unset DEBIAN_FRONTEND
cd $SCRIPT_DIRECTORY
echo "Set tetras-back's configuration file for apache 2"
echo "Set tetras-back's configuration file for ${WEB_SERVER}"
# Save last tetras-back-ssh.conf if exists
if [ -f /etc/apache2/sites-available/tetras-back-ssl.conf ]
if [ -f /etc/${WEB_SERVER}/sites-available/tetras-back-ssl.conf ]
then
echo "Dolibarr's apache configuration already exists"
echo "Backup file is created at" \
"/etc/apache2/sites-available/${RUNNING_DATE_TIME}_tetras-back-ssl.conf"
"/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}_tetras-back-ssl.conf"
echo "cp ${VERBOSE:+-v} /etc/apache2/sites-available/tetras-back-ssl.conf" \
"/etc/apache2/sites-available/${RUNNING_DATE_TIME}_tetras-back-ssl.conf"
cp ${VERBOSE:+-v} /etc/apache2/sites-available/tetras-back-ssl.conf \
/etc/apache2/sites-available/${RUNNING_DATE_TIME}_tetras-back-ssl.conf
echo "cp ${VERBOSE:+-v} /etc/${WEB_SERVER}/sites-available/tetras-back-ssl.conf" \
"/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}_tetras-back-ssl.conf"
cp ${VERBOSE:+-v} /etc/${WEB_SERVER}/sites-available/tetras-back-ssl.conf \
/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}_tetras-back-ssl.conf
fi
sed "s@<+ServerAdmin+>@${DOLIBARR_CONFIG_ServerAdmin:-<+ServerAdmin+>}@;
s@<+ServerName+>@${DOLIBARR_CONFIG_ServerName:-<+ServerName+>}@" \
`pwd`/template_tetras-back-ssl.conf > \
/etc/apache2/sites-available/tetras-back-ssl.conf
`pwd`/etc/${WEB_SERVER}/sites-available/tetras-back-ssl.conf > \
/etc/${WEB_SERVER}/sites-available/tetras-back-ssl.conf
# Set ssl.conf
if [ -f /etc/apache2/sites-available/ssl.conf ]
if [ -f /etc/${WEB_SERVER}/sites-available/ssl.conf ]
then
echo "Apache ssl configuration already exists"
echo "${WEB_SERVER} ssl configuration already exists"
echo "Backup file is created at " \
"/etc/apache2/sites-available/${RUNNING_DATE_TIME}-ssl.conf"
"/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}-ssl.conf"
echo "cp ${VERBOSE:+-v} /etc/apache2/sites-available/tetras-back-ssl.conf" \
"/etc/apache2/sites-available/${RUNNING_DATE_TIME}-ssl.conf"
cp ${VERBOSE:+-v} /etc/apache2/ssl.conf \
/etc/apache2/${RUNNING_DATE_TIME}-ssl.conf
echo "cp ${VERBOSE:+-v} /etc/${WEB_SERVER}/sites-available/tetras-back-ssl.conf" \
"/etc/${WEB_SERVER}/sites-available/${RUNNING_DATE_TIME}-ssl.conf"
cp ${VERBOSE:+-v} /etc/${WEB_SERVER}/ssl.conf \
/etc/${WEB_SERVER}/${RUNNING_DATE_TIME}-ssl.conf
fi
sed \
"s@<+SSLCertificateFile+>@${NEXTCLOUD_CONFIG_certificateFile:-<+SSLCertificateFile+>}@
s@<+SSLCertificateKeyFile+>@${NEXTCLOUD_CONFIG_certificateKeyFile:-<+SSLCertificateKeyFile+>}@" \
${SCRIPT_DIRECTORY%%/}/template_ssl.conf > \
/etc/apache2/ssl.conf
${SCRIPT_DIRECTORY%%/}/etc/${WEB_SERVER}/sites-available/ssl.conf > \
/etc/${WEB_SERVER}/ssl.conf
if [ ${WEB_SERVER} == "apache2" ]
then
a2ensite tetras-back-ssl.conf
apachectl configtest && apachectl restart || echo "Failed restartin apache"
else
ln -s /etc/nginx/sites-available/tetras-back-ssl.conf /etc/nginx/sites-enabled
systemctl restart nginx
fi
main.env.sample
+ 4
− 0
View file @ a55ecbf1
DOMAIN="dev.tetras-libre.fr"
SERVER_ADMIN="admin@dev.tetras-libre.fr"
WEB_SERVER=apache2
WEB_SERVER_PACKAGES="apache2 libapache2-mod-php5"
# Or for Nginx:
WEB_SERVER_PACKAGES="nginx-extras"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment