mirror of
https://github.com/certbot/certbot.git
synced 2026-03-01 21:00:31 -05:00
1ce813c3cc
This changes the apache plugin behaviour to only parse enabled configuration files and respecting the --apache-vhost-root CLI parameter for new SSL vhost creation. If --apache-vhost-root isn't defined, or doesn't exist, the SSL vhost will be created to originating non-SSL vhost directory. This PR also implements actual check for vhost enabled state, and makes sure parser.parse_file() does not discard changes in Augeas DOM, by doing an autosave. Also handles enabling the new SSL vhost, if it's on a path that's not parsed by Apache. Fixes: #1328 Fixes: #3545 Fixes: #3791 Fixes: #4523 Fixes: #4837 Fixes: #4905 * First changes * Handle rest of the errors * Test fixes * Final fixes * Make parse_files accessible and fix linter problems * Activate vhost at later time * Cleanup * Add a new test case, and fix old * Enable site later in deploy_cert * Make apache-conf-test default dummy configuration enabled * Remove is_sites_available as obsolete * Cleanup * Brought back conditional vhost_path parsing * Parenthesis * Fix merge leftovers * Fix to work with the recent changes to new file creation * Added fix and tests for non-symlink vhost in sites-enabled * Made vhostroot parameter for ApacheParser optional, and removed extra_path * Respect vhost-root, and add Include statements to root configuration if needed * Fixed site enabling order to prevent apache restart error while enabling mod_ssl * Don't exclude Ubuntu / Debian vhost-root cli argument * Changed the SSL vhost directory selection priority * Requested fixes for paths and vhost discovery * Make sure the Augeas DOM is written to disk before loading new files * Actual checking for if the file is parsed within existing Apache configuration * Fix the order of dummy SSL directives addition and enabling modules * Restructured site_enabled checks * Enabling vhost correctly for non-debian systems
79 lines
2.1 KiB
Bash
Executable file
79 lines
2.1 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# A hackish script to see if the client is behaving as expected
|
|
# with each of the "passing" conf files.
|
|
|
|
export EA=/etc/apache2/
|
|
TESTDIR="`dirname $0`"
|
|
cd $TESTDIR/passing
|
|
|
|
function CleanupExit() {
|
|
echo control c, exiting tests...
|
|
if [ "$f" != "" ] ; then
|
|
Cleanup
|
|
fi
|
|
exit 1
|
|
}
|
|
|
|
function Setup() {
|
|
if [ "$APPEND_APACHECONF" = "" ] ; then
|
|
sudo cp "$f" "$EA"/sites-available/
|
|
sudo ln -sf "$EA/sites-available/$f" "$EA/sites-enabled/$f"
|
|
echo "
|
|
<VirtualHost *:80>
|
|
ServerName example.com
|
|
DocumentRoot /tmp/
|
|
ErrorLog /tmp/error.log
|
|
CustomLog /tmp/requests.log combined
|
|
</VirtualHost>" | sudo tee $EA/sites-available/throwaway-example.conf >/dev/null
|
|
sudo ln -sf $EA/sites-available/throwaway-example.conf $EA/sites-enabled/throwaway-example.conf
|
|
else
|
|
TMP="/tmp/`basename \"$APPEND_APACHECONF\"`.$$"
|
|
sudo cp -a "$APPEND_APACHECONF" "$TMP"
|
|
sudo bash -c "cat \"$f\" >> \"$APPEND_APACHECONF\""
|
|
fi
|
|
}
|
|
|
|
function Cleanup() {
|
|
if [ "$APPEND_APACHECONF" = "" ] ; then
|
|
sudo rm /etc/apache2/sites-{enabled,available}/"$f"
|
|
sudo rm $EA/sites-available/throwaway-example.conf
|
|
sudo rm $EA/sites-enabled/throwaway-example.conf
|
|
else
|
|
sudo mv "$TMP" "$APPEND_APACHECONF"
|
|
fi
|
|
}
|
|
|
|
# if our environment asks us to enable modules, do our best!
|
|
if [ "$1" = --debian-modules ] ; then
|
|
sudo apt-get install -y libapache2-mod-wsgi
|
|
sudo apt-get install -y libapache2-mod-macro
|
|
|
|
for mod in ssl rewrite macro wsgi deflate userdir version mime setenvif ; do
|
|
echo -n enabling $mod
|
|
sudo a2enmod $mod
|
|
done
|
|
fi
|
|
|
|
|
|
FAILS=0
|
|
trap CleanupExit INT
|
|
for f in *.conf ; do
|
|
echo -n testing "$f"...
|
|
Setup
|
|
RESULT=`echo c | sudo $(command -v certbot) -vvvv --debug --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
|
|
if echo $RESULT | grep -Eq \("Which names would you like"\|"mod_macro is not yet"\) ; then
|
|
echo passed
|
|
else
|
|
echo failed
|
|
echo $RESULT
|
|
echo
|
|
echo
|
|
FAILS=`expr $FAILS + 1`
|
|
fi
|
|
Cleanup
|
|
done
|
|
if [ "$FAILS" -ne 0 ] ; then
|
|
exit 1
|
|
fi
|
|
exit 0
|