lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

Changed config and cache directory from necronda-server to necronda/server

Browse Source
This commit is contained in:
Lorenz Stechauner
2021-09-17 22:17:40 +02:00
parent b5749ae991
commit eeb0ce7035
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/cache.c
View File

@ -57,14 +57,17 @@ int cache_process() {
} }
cache = shm_rw; cache = shm_rw;
if (mkdir("/var/necronda-server/", 0755) < 0) { if (mkdir("/var/necronda/", 0755) < 0 && errno != EEXIST) {
if (errno != EEXIST) { fprintf(stderr, ERR_STR "Unable to create directory '/var/necronda/': %s" CLR_STR "\n", strerror(errno));
fprintf(stderr, ERR_STR "Unable to create directory '/var/necronda-server/': %s" CLR_STR "\n", strerror(errno));
return -3; return -3;
} }
if (mkdir("/var/necronda/server/", 0755) < 0 && errno != EEXIST) {
fprintf(stderr, ERR_STR "Unable to create directory '/var/necronda/server/': %s" CLR_STR "\n", strerror(errno));
return -3;
} }
FILE *cache_file = fopen("/var/necronda-server/cache", "rb"); FILE *cache_file = fopen("/var/necronda/server/cache", "rb");
if (cache_file != NULL) { if (cache_file != NULL) {
fread(cache, sizeof(cache_entry), CACHE_ENTRIES, cache_file); fread(cache, sizeof(cache_entry), CACHE_ENTRIES, cache_file);
fclose(cache_file); fclose(cache_file);
@ -191,7 +194,7 @@ int cache_process() {
if (cache_changed) { if (cache_changed) {
cache_changed = 0; cache_changed = 0;
cache_file = fopen("/var/necronda-server/cache", "wb"); cache_file = fopen("/var/necronda/server/cache", "wb");
if (cache_file == NULL) { if (cache_file == NULL) {
fprintf(stderr, ERR_STR "Unable to open cache file: %s" CLR_STR "\n", strerror(errno)); fprintf(stderr, ERR_STR "Unable to open cache file: %s" CLR_STR "\n", strerror(errno));
free(buf); free(buf);

4
src/lib/cache.h
View File

@ -18,10 +18,6 @@
# define CACHE_MAGIC_FILE "/usr/share/file/misc/magic.mgc" # define CACHE_MAGIC_FILE "/usr/share/file/misc/magic.mgc"
#endif #endif
#ifndef DEFAULT_CONFIG_FILE
# define DEFAULT_CONFIG_FILE "/etc/necronda-server/necronda-server.conf"
#endif
typedef struct { typedef struct {
char filename[256]; char filename[256];

5
src/lib/config.h
View File

@ -17,6 +17,11 @@
#define CONFIG_TYPE_LOCAL 1 #define CONFIG_TYPE_LOCAL 1
#define CONFIG_TYPE_REVERSE_PROXY 2 #define CONFIG_TYPE_REVERSE_PROXY 2
#ifndef DEFAULT_CONFIG_FILE
# define DEFAULT_CONFIG_FILE "/etc/necronda/server.conf"
#endif
typedef struct { typedef struct {
int type; int type;
char name[256]; char name[256];