iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a new config option SslPemFile

Browse Source 
This option defines an alternate part for <datadir>/znc.pem.

Thanks to evaryont for the idea and the patch.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2086 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-07-14 18:51:12 +00:00
parent e4006adc11
commit 7f53cc810b
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -29,3 +29,4 @@ Reed Loden <reed@reedloden.com>
Brian Campbell (bcampbell@splafinga.com)
Alexey "DarthGandalf" Sokolov (http://asokolov.co.cc/)
Joshua M. Clulow (http://sysmgr.org)
evaryont <colin@evaryont.me>

6
znc.cpp
View File

@@ -458,6 +458,8 @@ void CZNC::InitDirs(const CString& sArgvPath, const CString& sDataDir) {
} else {
m_sZNCPath = sDataDir;
}
m_sPemFile = m_sZNCPath + "/znc.pem";
}
CString CZNC::GetConfPath(bool bAllowMkDir) const {
@@ -533,6 +535,7 @@ bool CZNC::WriteConfig() {
m_LockFile.Write("AnonIPLimit = " + CString(m_uiAnonIPLimit) + "\n");
m_LockFile.Write("MaxBufferSize= " + CString(m_uiMaxBufferSize) + "\n");
m_LockFile.Write("SslPemFile = " + CString(m_sPemFile) + "\n");
for (size_t l = 0; l < m_vpListeners.size(); l++) {
CListener* pListener = m_vpListeners[l];
@@ -1610,6 +1613,9 @@ bool CZNC::DoRehash(CString& sError)
} else if (sName.Equals("MaxBufferSize")) {
m_uiMaxBufferSize = sValue.ToUInt();
continue;
} else if (sName.Equals("SslPemFile")) {
m_sPemFile = sValue;
continue;
}
}

3
znc.h
View File

@@ -101,7 +101,7 @@ public:
CString GetConfPath(bool bAllowMkDir = true) const;
CString GetUserPath() const;
CString GetModPath() const;
CString GetPemLocation() const { return GetZNCPath() + "/znc.pem"; }
CString GetPemLocation() const { return m_sPemFile; }
const CString& GetConfigFile() const { return m_sConfigFile; }
bool WritePemFile();
const CString& GetISpoofFile() const { return m_sISpoofFile; }
@@ -168,6 +168,7 @@ protected:
CString m_sOrigISpoof;
CString m_sISpoofFormat;
CString m_sPidFile;
CString m_sPemFile;
VCString m_vsVHosts;
VCString m_vsMotd;
CFile m_LockFile;