diff --git a/.etckeeper b/.etckeeper
index 745c4f1..d01caf4 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -2468,7 +2468,6 @@ maybe chmod 0644 'logrotate.d/httpd'
maybe chmod 0644 'logrotate.d/iptraf-ng'
maybe chmod 0644 'logrotate.d/kvm_stat'
maybe chmod 0644 'logrotate.d/lfd'
-maybe chmod 0644 'logrotate.d/mysecureshell'
maybe chmod 0644 'logrotate.d/mysql'
maybe chgrp 'named' 'logrotate.d/named'
maybe chmod 0640 'logrotate.d/named'
@@ -3953,7 +3952,6 @@ maybe chmod 0644 'pki/nssdb/key3.db'
maybe chmod 0644 'pki/nssdb/key4.db'
maybe chmod 0644 'pki/nssdb/pkcs11.txt'
maybe chmod 0644 'pki/nssdb/secmod.db'
-maybe chmod 0644 'pki/openssl10.cnf'
maybe chown 'pesign' 'pki/pesign'
maybe chgrp 'pesign' 'pki/pesign'
maybe chmod 0770 'pki/pesign'
@@ -4673,7 +4671,6 @@ maybe chgrp 'sqlgrey' 'sqlgrey/sqlgrey.sql'
maybe chmod 0640 'sqlgrey/sqlgrey.sql'
maybe chmod 0755 'ssh'
maybe chmod 0644 'ssh/moduli'
-maybe chmod 0644 'ssh/sftp_config'
maybe chmod 0644 'ssh/ssh_config'
maybe chmod 0755 'ssh/ssh_config.d'
maybe chmod 0644 'ssh/ssh_config.d/05-redhat.conf'
diff --git a/logrotate.d/mysecureshell b/logrotate.d/mysecureshell
deleted file mode 100644
index d95744d..0000000
--- a/logrotate.d/mysecureshell
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/sftp-server.log {
- weekly
- size=500k
- rotate 10
- compress
- delaycompress
- missingok
- notifempty
-}
diff --git a/pki/openssl10.cnf b/pki/openssl10.cnf
deleted file mode 100644
index 8f0f2a3..0000000
--- a/pki/openssl10.cnf
+++ /dev/null
@@ -1,352 +0,0 @@
-#
-# OpenSSL example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-
-# This definition stops the following lines choking if HOME isn't
-# defined.
-HOME = .
-RANDFILE = $ENV::HOME/.rnd
-
-# Extra OBJECT IDENTIFIER info:
-#oid_file = $ENV::HOME/.oid
-oid_section = new_oids
-
-# To use this configuration file with the "-extfile" option of the
-# "openssl x509" utility, name here the section containing the
-# X.509v3 extensions to use:
-# extensions =
-# (Alternatively, use a configuration file that has only
-# X.509v3 extensions in its main [= default] section.)
-
-[ new_oids ]
-
-# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
-# Add a simple OID like this:
-# testoid1=1.2.3.4
-# Or use config file substitution like this:
-# testoid2=${testoid1}.5.6
-
-# Policies used by the TSA examples.
-tsa_policy1 = 1.2.3.4.1
-tsa_policy2 = 1.2.3.4.5.6
-tsa_policy3 = 1.2.3.4.5.7
-
-####################################################################
-[ ca ]
-default_ca = CA_default # The default ca section
-
-####################################################################
-[ CA_default ]
-
-dir = /etc/pki/CA # Where everything is kept
-certs = $dir/certs # Where the issued certs are kept
-crl_dir = $dir/crl # Where the issued crl are kept
-database = $dir/index.txt # database index file.
-#unique_subject = no # Set to 'no' to allow creation of
- # several ctificates with same subject.
-new_certs_dir = $dir/newcerts # default place for new certs.
-
-certificate = $dir/cacert.pem # The CA certificate
-serial = $dir/serial # The current serial number
-crlnumber = $dir/crlnumber # the current crl number
- # must be commented out to leave a V1 CRL
-crl = $dir/crl.pem # The current CRL
-private_key = $dir/private/cakey.pem# The private key
-RANDFILE = $dir/private/.rand # private random number file
-
-x509_extensions = usr_cert # The extentions to add to the cert
-
-# Comment out the following two lines for the "traditional"
-# (and highly broken) format.
-name_opt = ca_default # Subject Name options
-cert_opt = ca_default # Certificate field options
-
-# Extension copying option: use with caution.
-# copy_extensions = copy
-
-# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
-# so this is commented out by default to leave a V1 CRL.
-# crlnumber must also be commented out to leave a V1 CRL.
-# crl_extensions = crl_ext
-
-default_days = 365 # how long to certify for
-default_crl_days= 30 # how long before next CRL
-default_md = sha256 # use SHA-256 by default
-preserve = no # keep passed DN ordering
-
-# A few difference way of specifying how similar the request should look
-# For type CA, the listed attributes must be the same, and the optional
-# and supplied fields are just that :-)
-policy = policy_match
-
-# For the CA policy
-[ policy_match ]
-countryName = match
-stateOrProvinceName = match
-organizationName = match
-organizationalUnitName = optional
-commonName = supplied
-emailAddress = optional
-
-# For the 'anything' policy
-# At this point in time, you must list all acceptable 'object'
-# types.
-[ policy_anything ]
-countryName = optional
-stateOrProvinceName = optional
-localityName = optional
-organizationName = optional
-organizationalUnitName = optional
-commonName = supplied
-emailAddress = optional
-
-####################################################################
-[ req ]
-default_bits = 2048
-default_md = sha256
-default_keyfile = privkey.pem
-distinguished_name = req_distinguished_name
-attributes = req_attributes
-x509_extensions = v3_ca # The extentions to add to the self signed cert
-
-# Passwords for private keys if not present they will be prompted for
-# input_password = secret
-# output_password = secret
-
-# This sets a mask for permitted string types. There are several options.
-# default: PrintableString, T61String, BMPString.
-# pkix : PrintableString, BMPString (PKIX recommendation before 2004)
-# utf8only: only UTF8Strings (PKIX recommendation after 2004).
-# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
-# MASK:XXXX a literal mask value.
-# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
-string_mask = utf8only
-
-# req_extensions = v3_req # The extensions to add to a certificate request
-
-[ req_distinguished_name ]
-countryName = Country Name (2 letter code)
-countryName_default = XX
-countryName_min = 2
-countryName_max = 2
-
-stateOrProvinceName = State or Province Name (full name)
-#stateOrProvinceName_default = Default Province
-
-localityName = Locality Name (eg, city)
-localityName_default = Default City
-
-0.organizationName = Organization Name (eg, company)
-0.organizationName_default = Default Company Ltd
-
-# we can do this but it is not needed normally :-)
-#1.organizationName = Second Organization Name (eg, company)
-#1.organizationName_default = World Wide Web Pty Ltd
-
-organizationalUnitName = Organizational Unit Name (eg, section)
-#organizationalUnitName_default =
-
-commonName = Common Name (eg, your name or your server\'s hostname)
-commonName_max = 64
-
-emailAddress = Email Address
-emailAddress_max = 64
-
-# SET-ex3 = SET extension number 3
-
-[ req_attributes ]
-challengePassword = A challenge password
-challengePassword_min = 4
-challengePassword_max = 20
-
-unstructuredName = An optional company name
-
-[ usr_cert ]
-
-# These extensions are added when 'ca' signs a request.
-
-# This goes against PKIX guidelines but some CAs do it and some software
-# requires this to avoid interpreting an end user certificate as a CA.
-
-basicConstraints=CA:FALSE
-
-# Here are some examples of the usage of nsCertType. If it is omitted
-# the certificate can be used for anything *except* object signing.
-
-# This is OK for an SSL server.
-# nsCertType = server
-
-# For an object signing certificate this would be used.
-# nsCertType = objsign
-
-# For normal client use this is typical
-# nsCertType = client, email
-
-# and for everything including object signing:
-# nsCertType = client, email, objsign
-
-# This is typical in keyUsage for a client certificate.
-# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-
-# This will be displayed in Netscape's comment listbox.
-nsComment = "OpenSSL Generated Certificate"
-
-# PKIX recommendations harmless if included in all certificates.
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer
-
-# This stuff is for subjectAltName and issuerAltname.
-# Import the email address.
-# subjectAltName=email:copy
-# An alternative to produce certificates that aren't
-# deprecated according to PKIX.
-# subjectAltName=email:move
-
-# Copy subject details
-# issuerAltName=issuer:copy
-
-#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem
-#nsBaseUrl
-#nsRevocationUrl
-#nsRenewalUrl
-#nsCaPolicyUrl
-#nsSslServerName
-
-# This is required for TSA certificates.
-# extendedKeyUsage = critical,timeStamping
-
-[ v3_req ]
-
-# Extensions to add to a certificate request
-
-basicConstraints = CA:FALSE
-keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-
-[ v3_ca ]
-
-
-# Extensions for a typical CA
-
-
-# PKIX recommendation.
-
-subjectKeyIdentifier=hash
-
-authorityKeyIdentifier=keyid:always,issuer
-
-# This is what PKIX recommends but some broken software chokes on critical
-# extensions.
-#basicConstraints = critical,CA:true
-# So we do this instead.
-basicConstraints = CA:true
-
-# Key usage: this is typical for a CA certificate. However since it will
-# prevent it being used as an test self-signed certificate it is best
-# left out by default.
-# keyUsage = cRLSign, keyCertSign
-
-# Some might want this also
-# nsCertType = sslCA, emailCA
-
-# Include email address in subject alt name: another PKIX recommendation
-# subjectAltName=email:copy
-# Copy issuer details
-# issuerAltName=issuer:copy
-
-# DER hex encoding of an extension: beware experts only!
-# obj=DER:02:03
-# Where 'obj' is a standard or added object
-# You can even override a supported extension:
-# basicConstraints= critical, DER:30:03:01:01:FF
-
-[ crl_ext ]
-
-# CRL extensions.
-# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
-
-# issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always
-
-[ proxy_cert_ext ]
-# These extensions should be added when creating a proxy certificate
-
-# This goes against PKIX guidelines but some CAs do it and some software
-# requires this to avoid interpreting an end user certificate as a CA.
-
-basicConstraints=CA:FALSE
-
-# Here are some examples of the usage of nsCertType. If it is omitted
-# the certificate can be used for anything *except* object signing.
-
-# This is OK for an SSL server.
-# nsCertType = server
-
-# For an object signing certificate this would be used.
-# nsCertType = objsign
-
-# For normal client use this is typical
-# nsCertType = client, email
-
-# and for everything including object signing:
-# nsCertType = client, email, objsign
-
-# This is typical in keyUsage for a client certificate.
-# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-
-# This will be displayed in Netscape's comment listbox.
-nsComment = "OpenSSL Generated Certificate"
-
-# PKIX recommendations harmless if included in all certificates.
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer
-
-# This stuff is for subjectAltName and issuerAltname.
-# Import the email address.
-# subjectAltName=email:copy
-# An alternative to produce certificates that aren't
-# deprecated according to PKIX.
-# subjectAltName=email:move
-
-# Copy subject details
-# issuerAltName=issuer:copy
-
-#nsCaRevocationUrl = http://www.domain.dom/ca-crl.pem
-#nsBaseUrl
-#nsRevocationUrl
-#nsRenewalUrl
-#nsCaPolicyUrl
-#nsSslServerName
-
-# This really needs to be in place for it to be a proxy certificate.
-proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
-
-####################################################################
-[ tsa ]
-
-default_tsa = tsa_config1 # the default TSA section
-
-[ tsa_config1 ]
-
-# These are used by the TSA reply generation only.
-dir = ./demoCA # TSA root directory
-serial = $dir/tsaserial # The current serial number (mandatory)
-crypto_device = builtin # OpenSSL engine to use for signing
-signer_cert = $dir/tsacert.pem # The TSA signing certificate
- # (optional)
-certs = $dir/cacert.pem # Certificate chain to include in reply
- # (optional)
-signer_key = $dir/private/tsakey.pem # The TSA private key (optional)
-
-default_policy = tsa_policy1 # Policy if request did not specify it
- # (optional)
-other_policies = tsa_policy2, tsa_policy3 # acceptable policies (optional)
-digests = sha1, sha256, sha384, sha512 # Acceptable message digests (mandatory)
-accuracy = secs:1, millisecs:500, microsecs:100 # (optional)
-clock_precision_digits = 0 # number of digits after dot. (optional)
-ordering = yes # Is ordering defined for timestamps?
- # (optional, default: no)
-tsa_name = yes # Must the TSA name be included in the reply?
- # (optional, default: no)
-ess_cert_id_chain = no # Must the ESS cert id chain be included?
- # (optional, default: no)
diff --git a/shells b/shells
index 74d4a97..f427b27 100644
--- a/shells
+++ b/shells
@@ -4,4 +4,3 @@
/usr/bin/bash
/usr/bin/tmux
/bin/tmux
-/bin/MySecureShell
diff --git a/ssh/sftp_config b/ssh/sftp_config
deleted file mode 100644
index a240eb6..0000000
--- a/ssh/sftp_config
+++ /dev/null
@@ -1,86 +0,0 @@
-## MySecureShell Configuration File ##
-#Default rules for everybody
-
- GlobalDownload 50k #total speed download for all clients
- # o -> bytes k -> kilo bytes m -> mega bytes
- GlobalUpload 0 #total speed download for all clients (0 for unlimited)
- Download 5k #limit speed download for each connection
- Upload 0 #unlimit speed upload for each connection
- StayAtHome true #limit client to his home
- VirtualChroot true #fake a chroot to the home account
- LimitConnection 10 #max connection for the server sftp
- LimitConnectionByUser 1 #max connection for the account
- LimitConnectionByIP 2 #max connection by ip for the account
- Home /home/$USER #overrite home of the user but if you want you can use
- # environment variable (ie: Home /home/$USER)
- IdleTimeOut 5m #(in second) deconnect client is idle too long time
- ResolveIP true #resolve ip to dns
-# IgnoreHidden true #treat all hidden files as if they don't exist
-# DirFakeUser true #Hide real file/directory owner (just change displayed permissions)
-# DirFakeGroup true #Hide real file/directory group (just change displayed permissions)
-# DirFakeMode 0400 #Hide real file/directory rights (just change displayed permissions)
- #Add execution right for directory if read right is set
- HideNoAccess true #Hide file/directory which user has no access
-# MaxOpenFilesForUser 20 #limit user to open x files on same time
-# MaxWriteFilesForUser 10 #limit user to x upload on same time
-# MaxReadFilesForUser 10 #limit user to x download on same time
- DefaultRights 0640 0750 #Set default rights for new file and new directory
-# MinimumRights 0400 0700 #Set minimum rights for files and dirs
-
- ShowLinksAsLinks false #show links as their destinations
-# ConnectionMaxLife 1d #limits connection lifetime to 1 day
-
-# Charset "ISO-8859-15" #set charset of computer
-
-
-#Rules only for group ftp
-#
-# Download 25 k/s
-# LogFile /var/log/sftp-server_ftp.log #Change logfile
-# ExpireDate "2007-02-28 18:31:01"
-#
-
-#
-# IsAdmin true #can admin the server
-# VirtualChroot false #you must disable chroot to have a full support of admin
-# StayAtHome true
-# IdleTimeOut 0
-#
-
-#
-# SftpProtocol 3 #force protocol SFTP
-# DisableAccount true #disable account
-#
-
-#Rules only for group ftpnolimit
-#
-# Download 0 #0 = unlimited
-# IdleTimeOut 0 #no timeout
-# DirFakeUser false #show real user on file/directory
-# DirFakeGroup false #show real group on file/directory
-# DirFakeMode 0 #show real rights on file/directory
-# MaxReadFilesForUser 0 #0 = unlimited but still have the restriction MaxOpenFilesForUser
-#
-
-#
-# ByPassGlobalDownload true #bypass GlobalDownload restriction
-# ByPassGlobalUpload true #bypass GlobalUpload restriction
-# Download 0
-# DisableAccount false #enable account
-# IdleTimeOut 0 #disable timeout
-# LimitConnectionByIP 0 #no limit
-#
-
-#
-# Shell /bin/tcsh #give a shell access to TRUSTED clients !!!
-#
-
-#
-# DirFakeUser false #show real user on file/directory
-# DirFakeGroup false #show real group on file/directory
-# DirFakeMode 0 #show real rights on file/directory
-# HideNoAccess false
-# IgnoreHidden false
-#
-
-#Include /etc/my_sftp_config_file #include this valid configuration file