Apache now replaced with nginx

docker-compose.yaml

@@ -1,10 +1,22 @@
 services:
-  apache-httpd:
-    container_name: httpd-server
+#  apache-httpd:
+#    container_name: httpd-server-apache
+#    build:
+#      context: ./httpd/
+#      dockerfile: ./Dockerfile-apache
+#      args:
+#         - APACHE_LOG_DIR="/var/log/httpd-server/"
+#    restart: on-failure
+#    ports:
+#      - "8080:80"
+#    networks:
+#      - internal_net
+
+  nginx-httpd:
+    container_name: httpd-server-nginx
     build:
       context: ./httpd/
-      args:
-         - APACHE_LOG_DIR="/var/log/httpd-server/"
+      dockerfile: ./Dockerfile-nginx
     restart: on-failure
     ports:
       - "8080:80"
@@ -17,7 +29,8 @@ services:
       context: ./server/
     restart: on-failure
     depends_on:
-      - apache-httpd
+    #  - apache-httpd
+      - nginx-httpd
     networks:
       - internal_net
 

httpd/Dockerfile → httpd/Dockerfile-apache

@@ -6,14 +6,14 @@ COPY ./static/ /var/www/localhost/htdocs/static/
 
 # add custom apache configs
 RUN mkdir -p /etc/apache2/conf-custom
-COPY ./conf/custom/ /etc/apache2/conf-custom/
+COPY ./apache-conf/custom/ /etc/apache2/conf-custom/
 
 # create logs directory (temporary disabled)
 ARG APACHE_LOG_DIR
 RUN mkdir -p ${APACHE_LOG_DIR}
 RUN chown www-data:www-data ${APACHE_LOG_DIR}
 
 # setup main apache configuration
-COPY ./conf/httpd.conf /usr/local/apache2/conf/httpd.conf
+COPY ./apache-conf/httpd.conf /usr/local/apache2/conf/httpd.conf
 
 EXPOSE 80

httpd/Dockerfile-nginx

@@ -0,0 +1,7 @@
+FROM nginx:latest
+
+COPY /nginx-conf/httpd.conf /etc/nginx/conf.d/default.conf
+COPY ./static/ /var/www/html/
+
+EXPOSE 80
+#EXPOSE 443

httpd/conf/custom/apache-httpd-lab1.conf → httpd/apache-conf/custom/apache-httpd-lab1.conf

@@ -16,10 +16,10 @@
     # FastCGI server setup start
     # ==========================
 
-    ProxyPass /fcgi-bin/ fcgi://fastcgi-server:55555/
-    ProxyPassReverse /fcgi-bin/ fcgi://fastcgi-server:55555/
+    ProxyPass /fcgi/ fcgi://fastcgi-server:55555/
+    ProxyPassReverse /fcgi/ fcgi://fastcgi-server:55555/
 
-    <Location "/fcgi-bin/">
+    <Location "/fcgi/">
         Require all granted
     </Location>
 

httpd/nginx-conf/httpd.conf

@@ -0,0 +1,18 @@
+server {
+    listen 80;
+
+    root /var/www/html;
+
+    # Обработка статических файлов
+    location / {
+        try_files $uri $uri/ =404;
+    }
+
+    location /fcgi/ {
+        # Базовые настройки FastCGI
+        include fastcgi_params;
+
+        # Адрес FastCGI сервера
+        fastcgi_pass fastcgi-server:55555;
+    }
+}

httpd/static/index.html

@@ -666,7 +666,29 @@ <h3 class="history-title">История введенных данных</h3>
 			const Y = document.getElementById('Y').value;
 
 			if (X && R && Y) {
-				sendAJAXGETRequest("/fcgi-bin/", {"x": X, "y": Y, "r": R}, (resp) => {FFCGIResponceHandler(resp, X, Y, R)});
+
+				// Stub
+				sendAJAXGETRequest("/fcgi/", {"x": X, "y": Y, "r": R}, (data) => {console.log(data)});
+				console.log(`Данные отправлены!\nX: ${X}\nY: ${Y}\nR: ${R}`);	
+
+				// Сохраняем данные в историю
+				const formData = {
+					timestamp: new Date().toISOString(),
+					X: X,
+					Y: Y,
+					R: R,
+					elapsedTimeMs: 100,
+					isHitted: true
+				};
+
+				formHistory.push(formData);
+				localStorage.setItem('formHistory', JSON.stringify(formHistory));	
+
+				// Обновляем таблицу
+				refreshHistoryTable();
+
+				// Обновляем график
+				refreshGraph();
 
 				// Очищаем форму
 				this.reset();