Merge branch 'libs/openssl/local'

[cassiopeia.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 1fb8d83ab43a1063dc3dbe60106683ad18af882b..cf4f383d843e396b1850e87e2a2aeccc05a9eea9 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,21 +1,3 @@
-/*
-    Cassiopeia - CAcert signing module
-    Copyright (C) 2014  CAcert Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -63,7 +45,11 @@ int main( int argc, const char* argv[] ) {
     }
 
     std::ifstream config;
-    config.open( "config.txt" );
+    if(DAEMON){
+      config.open( "/etc/cacert/cassiopeia/cassiopeia.conf" );
+    }else{
+      config.open( "config.txt" );
+    }
 
     if( !config.is_open() ) {
         std::cerr << "config missing" << std::endl;