Skip to content
Snippets Groups Projects
Commit 72fc92a7 authored by Tomáš Plesník's avatar Tomáš Plesník
Browse files

odstranani merge tagu

parent 53830333
Branches
Tags
No related merge requests found
...@@ -281,7 +281,6 @@ doTemplate \ ...@@ -281,7 +281,6 @@ doTemplate \
# update Apache configuration file # update Apache configuration file
echo -n "Updating Apache configuration file ... " echo -n "Updating Apache configuration file ... "
<<<<<<< HEAD
cert_file_tmp=`fgrep SSLCertificateFile $apache_conf` cert_file_tmp=`fgrep SSLCertificateFile $apache_conf`
key_file_tmp=`fgrep SSLCertificateKeyFile $apache_conf` key_file_tmp=`fgrep SSLCertificateKeyFile $apache_conf`
ca_file_tmp=`fgrep SSLCACertificateFile $apache_conf` ca_file_tmp=`fgrep SSLCACertificateFile $apache_conf`
...@@ -290,7 +289,6 @@ cert_file=${cert_file_tmp##*" "} ...@@ -290,7 +289,6 @@ cert_file=${cert_file_tmp##*" "}
key_file=${key_file_tmp##*" "} key_file=${key_file_tmp##*" "}
ca_file=${ca_file_tmp##*" "} ca_file=${ca_file_tmp##*" "}
lib=${lib_tmp##*" "} lib=${lib_tmp##*" "}
>>>>>>> ced3b6d0c942211d77a5763d722ec616009be87f
doTemplate \ doTemplate \
_CERT_FILE_ "$cert_file" \ _CERT_FILE_ "$cert_file" \
_KEY_FILE_ "$key_file" \ _KEY_FILE_ "$key_file" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment