Issue NagiosEnterprises#685 - Add Ability To Set A Comment To Expire

Small clean up for docker and delete macro.
iwhite-nagios · Feb 11, 2020 · 97805e4 · 97805e4
1 parent 95b9eb3
commit 97805e4
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 29 deletions.
diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c
@@ -1009,16 +1009,6 @@ void get_time_string(time_t *raw_time, char *buffer, int buffer_length, int type
 	/* expiration date/time for HTTP headers */
 	else if(type == HTTP_DATE_TIME)
 		snprintf(buffer, buffer_length, "%s, %02d %s %d %02d:%02d:%02d GMT", weekdays[tm_ptr->tm_wday], day, months[tm_ptr->tm_mon], year, hour, minute, second);
-    else if (type == EXPIRES_DATE_TIME)
-			snprintf(buffer,
-			         buffer_length,
-			         "%04d-%02d-%02dT%02d:%02d:%02d",
-			         tm_ptr->tm_year + 1900,
-			         tm_ptr->tm_mon + 1,
-			         tm_ptr->tm_mday,
-			         tm_ptr->tm_hour,
-			         tm_ptr->tm_min,
-			         tm_ptr->tm_sec);
 
     /* short time */
 	else

diff --git a/Dockerfile → docker/Dockerfile b/Dockerfile → docker/Dockerfile
@@ -2,8 +2,8 @@ FROM vim
 LABEL author="Isaac A. White <iwhite@nagios.com>"
 
 WORKDIR /var/www/html/
-COPY .vimrc /root/.vimrc
-COPY .vim /root/
+COPY ../.vimrc /root/.vimrc
+COPY ../.vim /root/
 
 # WORKDIR /var/www/html/plugins
 # RUN ./tools/setup && ./configure

diff --git a/Dockerfile-centos7 → docker/Dockerfile-centos7 b/Dockerfile-centos7 → docker/Dockerfile-centos7
diff --git a/docker-compose-centos7-vim.yml → docker/docker-compose-centos7.yml b/docker-compose-centos7-vim.yml → docker/docker-compose-centos7.yml
diff --git a/docker-compose.yml → docker/docker-compose.yml b/docker-compose.yml → docker/docker-compose.yml
diff --git a/exec.bat → docker/exec.bat b/exec.bat → docker/exec.bat
diff --git a/docker/exec.sh b/docker/exec.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker exec -it ncen /bin/bash
+
diff --git a/docker/install.sh b/docker/install.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+docker exec -w /var/www/html/ -it ncen ./configure
+docker exec -w /var/www/html/ -it ncen make all install
+./plugins.sh
+
+
diff --git a/docker/plugins.sh b/docker/plugins.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+docker exec -w /var/www/html/plugins -it ncen ./tools/setup
+docker exec -w /var/www/html/plugins -it ncen ./configure
+docker exec -w /var/www/html/plugins -it ncen make
+docker exec -w /var/www/html/plugins -it ncen make install
+
diff --git a/exec.sh b/exec.sh
diff --git a/install.sh b/install.sh
diff --git a/plugins b/plugins
diff --git a/plugins.sh b/plugins.sh