Browse Source

site dockerfile changed

kora 10 months ago
parent
commit
cc9418f446
3 changed files with 6 additions and 9 deletions
  1. 1 0
      site2/Dockerfile
  2. 2 6
      site2/deploy/httpd.conf
  3. 3 3
      site2/deploy/tigro.conf

+ 1 - 0
site2/Dockerfile

@@ -2,6 +2,7 @@ FROM httpd:latest
 COPY . /usr/local/apache2/htdocs/
 COPY js/toExport_alt.js /usr/local/apache2/htdocs/js/toExport.js
 COPY deploy/httpd.conf /usr/local/apache2/conf/
+COPY deploy/tigro.cong /usr/local/apache2/conf/sites/
 
 EXPOSE 80
 

+ 2 - 6
site2/deploy/httpd.conf

@@ -218,12 +218,6 @@ Group www-data
 # server, which responds to any requests that aren't handled by a
 # <VirtualHost> definition.  These values also provide defaults for
 # any <VirtualHost> containers you may define later in the file.
-<VirtualHost *:80>
-
-        ProxyPass /data http://127.0.0.42:5000
-        ProxyPassReverse /data http://127.0.0.42:5000
-
-</VirtualHost>
 #
 # All of these directives may appear inside <VirtualHost> containers,
 # in which case these default settings will be overridden for the
@@ -554,3 +548,5 @@ Include conf/extra/proxy-html.conf
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </IfModule>
+
+IncludeOptional conf/sites/tigro.conf

+ 3 - 3
site2/deploy/tigro.conf

@@ -9,7 +9,7 @@
         #ServerName www.example.com
 
         ServerAdmin webmaster@localhost
-        DocumentRoot /usr/local/apache2/htdocs/tigro_website
+        DocumentRoot /usr/local/apache2/htdocs
 
         # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
         # error, crit, alert, emerg.
@@ -17,8 +17,8 @@
         # modules, e.g.
         #LogLevel info ssl:warn
 
-        ErrorLog ${APACHE_LOG_DIR}/error.log
-        CustomLog ${APACHE_LOG_DIR}/access.log combined
+        ErrorLog error.log
+        CustomLog access.log combined
 
         # For most configuration files from conf-available/, which are
         # enabled or disabled at a global level, it is possible to