Update to 1.5-10

EyesOfNetworkCommunity · May 13, 2018 · c215f4f · c215f4f
1 parent 7383851
commit c215f4f
Show file tree

Hide file tree

Showing 37 changed files with 269 additions and 129 deletions.
diff --git a/GPL b/GPL
diff --git a/GPL b/GPL
@@ -0,0 +1 @@
+COPYING
diff --git a/Makefile b/Makefile
@@ -30,9 +30,10 @@ GED	      := ged
 GEDQ	      := gedq
 MODDUMMY      := geddummy-1.5.so
 MODMYSQL      := gedmysql-1.5.so
-MODHDB	      := gedhdb-1.5.so
-MODTDB	      := gedtdb-1.5.so
-MOD	      := $(MODDUMMY) $(MODHDB) $(MODMYSQL)
+#MODHDB	      := gedhdb-1.5.so
+#MODTDB	      := gedtdb-1.5.so
+#MOD	      := $(MODDUMMY) $(MODHDB) $(MODMYSQL)
+MOD	      := $(MODDUMMY) $(MODMYSQL)
 
 # debug preprocessors
 GEDDEBUG      := -D__GED_DEBUG_SQL__ -D__GED_DEBUG_SEM__
@@ -46,7 +47,7 @@ LIBS	      := `pkg-config --libs libgenerics-1.3`
 LIBS	      += `pkg-config --libs glib-2.0`
 LIBS	      += -lssl -lpthread -lgcrypt -lz
 MYSQLLIBS     := /usr/lib64/mysql/libmysqlclient.so
-BDBLIBS	      := /usr/lib64/libdb.so
+#BDBLIBS	      := /usr/lib64/libdb.so
 
 # paths
 SRCCOR	      := ./src
@@ -90,7 +91,7 @@ dummy: $(MODDUMMY)
 
 mysql: $(MODMYSQL)
 
-bdb : $(MODHDB) $(MODTDB)
+#bdb : $(MODHDB) $(MODTDB)
 
 # generic rules
 csocket.o : $(SRCCOR)/csocket.c
@@ -141,17 +142,17 @@ gedq.o : $(SRCCOR)/gedq.c
 	@echo "[CC] $<"
 	@$(CC) $(GEDQFLAGS) -c $<
 
-cgedbackendbdb.o : $(SRCCOR)/cgedbackendbdb.c
-	@echo "[CC] $<"
-	@$(CC) $(GEDFLAGS) -o $@ -c $<
-
-cgedbackendhdb.o : $(SRCCOR)/cgedbackendhdb.c
-	@echo "[CC] $<"
-	@$(CC) $(GEDFLAGS) -o $@ -c $<
+#cgedbackendbdb.o : $(SRCCOR)/cgedbackendbdb.c
+#	@echo "[CC] $<"
+#	@$(CC) $(GEDFLAGS) -o $@ -c $<
 
-cgedbackendtdb.o : $(SRCCOR)/cgedbackendtdb.c
-	@echo "[CC] $<"
-	@$(CC) $(GEDFLAGS) -o $@ -c $<
+#cgedbackendhdb.o : $(SRCCOR)/cgedbackendhdb.c
+#	@echo "[CC] $<"
+#	@$(CC) $(GEDFLAGS) -o $@ -c $<
+#
+#cgedbackendtdb.o : $(SRCCOR)/cgedbackendtdb.c
+#	@echo "[CC] $<"
+#	@$(CC) $(GEDFLAGS) -o $@ -c $<
 
 # main targets
 $(GED) : $(LIBGED) gedmain.o
@@ -188,13 +189,13 @@ geddummy-1.5.so : $(SRCCOR)/cgedbackenddummy.c
 	@echo "[LK] $@"
 	@$(CC) -shared $(GEDFLAGS) $^ -o $@
 
-gedhdb-1.5.so : cgedbackendbdb.o cgedbackendhdb.o
-	@echo "[LK] $@"
-	@$(CC) -shared $(GEDFLAGS) $^ -o $@ $(BDBLIBS)
+#gedhdb-1.5.so : cgedbackendbdb.o cgedbackendhdb.o
+#	@echo "[LK] $@"
+#	@$(CC) -shared $(GEDFLAGS) $^ -o $@ $(BDBLIBS)
 
-gedtdb-1.5.so : cgedbackendbdb.o cgedbackendtdb.o
-	@echo "[LK] $@"
-	@$(CC) -shared $(GEDFLAGS) $^ -o $@ $(BDBLIBS)
+#gedtdb-1.5.so : cgedbackendbdb.o cgedbackendtdb.o
+#	@echo "[LK] $@"
+#	@$(CC) -shared $(GEDFLAGS) $^ -o $@ $(BDBLIBS)
 
 clean :
 	@echo -n "cleaning... "

diff --git a/etc.in/ged_rss.conf b/etc.in/ged_rss.conf
@@ -1,29 +1,22 @@
-# --- REMOTE_USER
-<Directory /srv/eyesofnetwork>
-	SetEnvIf Cookie "user_name=([^;]+)" REMOTE_USER=admin
-	#SetEnvIf Cookie "user_name=([^;]+)" REMOTE_USER=$1
-</Directory>
-# --- END REMOTE_USER
+Alias /ged_rss "/srv/eyesofnetwork/ged/var/www/"
 
-Alias /ged_rss /srv/eyesofnetwork/ged/var/www/
-<Directory /srv/eyesofnetwork/ged/var/www/>
+<Directory "/srv/eyesofnetwork/ged/var/www/">
 	Options -Indexes
+	Require all granted
 
-        <Files ~ (rss.xml|index.html)>
-        </Files>
         <Files ~ (index.php)>
                 AuthType Basic
                 AuthName "Restricted"
-                AuthFormAuthoritative On
-                AuthFormMySQLSocket /var/lib/mysql/mysql.sock
-                AuthFormMySQLUsername eonweb
-                AuthFormMySQLPassword root66
-                AuthFormMySQLDB eonweb
-                AuthFormMySQLTableSID sessions,users,groupright
-                AuthFormMySQLFieldUID sessions.user_id
-                AuthFormMySQLTableSIDCondition "`sessions`.`session_id`=$session_id AND `sessions`.`user_id`=$user_id AND `users`.`user_id`=$user_id AND `users`.`user_name`=$user_name AND `users`.`group_id`=$group_id AND `groupright`.`group_id`=$group_id"
-                AuthFormPageLogin /login.php
-                AuthFormSessionCookies On
+                AuthEonAuthoritative On
+                AuthEonMySQLSocket /var/lib/mysql/mysql.sock
+                AuthEonMySQLUsername eonweb
+                AuthEonMySQLPassword root66
+                AuthEonMySQLDB eonweb
+                AuthEonMySQLTableSID sessions,users,groupright
+                AuthEonMySQLFieldUID sessions.user_id
+                AuthEonMySQLTableSIDCondition "`sessions`.`session_id`=$session_id AND `sessions`.`user_id`=$user_id AND `users`.`user_id`=$user_id AND `users`.`user_name`=$user_name AND `users`.`group_id`=$group_id AND `groupright`.`group_id`=$group_id"
+                AuthEonPageLogin /login.php
+                AuthEonSessionCookies On
                 Require valid-user
         </Files>
 </Directory>
diff --git a/etc.in/gedd b/etc.in/gedd
diff --git a/etc.in/gedd.service b/etc.in/gedd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Generic Event Dispatcher Daemon
+After=network.target
+After=mariadb.service
+
+[Service]
+Type=forking
+ExecStart=/srv/eyesofnetwork/ged/bin/ged -c /srv/eyesofnetwork/ged/etc/ged.cfg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/etc.in/purge_ged b/etc.in/purge_ged
@@ -0,0 +1 @@
+50 3 * * * * root /srv/eyesofnetwork/ged/scripts/purge_event.sh 86400 > /dev/null 2>&1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		50 3 * * * * root /srv/eyesofnetwork/ged/scripts/purge_event.sh 86400 > /dev/null 2>&1