cleanup
authorberq <bs@cyontris.eu>
Thu, 26 Dec 2013 11:04:17 +0000 (12:04 +0100)
committerberq <bs@cyontris.eu>
Thu, 26 Dec 2013 11:04:17 +0000 (12:04 +0100)
src/practical_settings/DBs.tex

index b370be1..13c9983 100644 (file)
@@ -48,16 +48,8 @@ ssl-cipher=EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EDH+CAMELLIA256
 % in case you have the need for further justifications why you chose this and that setting or if the settings do not fit into the standard Variant A or Variant B schema, please document this here
 
 \item[References:]
 % in case you have the need for further justifications why you chose this and that setting or if the settings do not fit into the standard Variant A or Variant B schema, please document this here
 
 \item[References:]
-<<<<<<< HEAD
-+{\small \url{https://dev.mysql.com/doc/refman/5.5/en/ssl-connections.html}}
-
-
-% add any further references or best practice documents here
-=======
 {\small \url{https://dev.mysql.com/doc/refman/5.5/en/ssl-connections.html}}
 
 {\small \url{https://dev.mysql.com/doc/refman/5.5/en/ssl-connections.html}}
 
->>>>>>> upstream/master
-
 \item[How to test:]
 
 After restarting the server run the following query to see if the ssl settings are correct:
 \item[How to test:]
 
 After restarting the server run the following query to see if the ssl settings are correct:
@@ -103,22 +95,7 @@ TLS_RSA_WITH_AES_128_CBC_SHA,
 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
 
 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
 TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
 
-<<<<<<< HEAD
-\subsubsection{DB2}
-\todo{write this}
-
-% 
-
-% ssl_ciphersepcs v9r7:
-% http://pic.dhe.ibm.com/infocenter/db2luw/v9r7/index.jsp?topic=%2Fcom.ibm.db2.luw.admin.config.doc%2Fdoc%2Fr0053617.html
-
-% Configuring Secure Sockets Layer (SSL) support in a DB2 instance v9r7
-% http://pic.dhe.ibm.com/infocenter/db2luw/v10r5/index.jsp?topic=%2Fcom.ibm.db2.luw.admin.sec.doc%2Fdoc%2Fc0053544.html
-
-
-=======
 \end{lstlisting}
 \end{lstlisting}
->>>>>>> upstream/master
 
 \end{description}
 
 
 \end{description}