Remove SSL bullshit and change the position of the enviornment variables section

1 files changed, 10 insertions, 34 deletions

diff --git a/mkshrc b/mkshrc
index f571b05..3cf7780 100644
--- a/mkshrc
+++ b/mkshrc
@@ -122,32 +122,6 @@ setcoloraliases() {
 	alias search='egrep --color=auto -rnI';
 	alias t='tree -CdL'
 }
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-#  ____ ____  _       _____                 _   _                 
-# / ___/ ___|| |     |  ___|   _ _ __   ___| |_(_) ___  _ __  ___ 
-# \___ \___ \| |     | |_ | | | | '_ \ / __| __| |/ _ \| '_ \/ __|
-#  ___) |__) | |___  |  _|| |_| | | | | (__| |_| | (_) | | | \__ \
-# |____/____/|_____| |_|   \__,_|_| |_|\___|\__|_|\___/|_| |_|___/
-#                                                                 
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-mkrootcrt() {
-	name="$1"
-	$openssl genpkey -algorithm RSA -out ${name}.key -aes-128-cbc -pkeyopt rsa_keygen_bits:4096
-	$openssl req -x509 -new -nodes -key ${name}.key -days 20000 -out ${name}.pem
-}
-# Depnds on ENV variable CA_CERT and CA_KEY
-gencrt() {
-	name="$1"
-	$openssl genpkey -algorithm RSA -out ${name}.key -pkeyopt rsa_keygen_bits:4096
-	$openssl req -new -key ${name}.key -out ${name}.csr
-	$openssl x509 -req -in ${name}.csr -CA $CA_CERT -CAkey $CA_KEY \
-		-CAcreateserial -out ${name}.crt -days 365
-}
-gencsr() {
-	name="$1"
-	$openssl genpkey -algorithm RSA -out ${name}.key -pkeyopt rsa_keygen_bits:4096
-	$openssl req -new -key ${name}.key -out ${name}.csr
-}
 # Usage debugstarttls $ipaddr:$port
 debugstarttls() {
 	openssl s_client -starttls smtp -crlf -connect $1 $2
@@ -547,19 +521,21 @@ UPDATE_URL="https://www.rygel.us/etc/"
 FANCY_PROMPT=1
 COLOR=1
 
-############################################################
-########## Enviroment variables
-export PAGER="less"
-
 # For use with SSL functions
-export openssl="openssl"
-export CA_CERT="/srv/ssl/root.pem"
-export CA_KEY="/srv/ssl/root.key"
-
+# Just use easy-rsa, it's less hassle
 
 # Load our system profile
 . /etc/profile
 
+
+############################################################
+########## Enviroment variables
+export PAGER="less"
+export EDITOR="vi"
+export PATH="$HOME/bin:$PATH"
+export VISUAL="$EDITOR"
+
+
 # Load pre config
 if [ -e $PRELOAD ] ; then
 	. $PRELOAD