champs-libres/openstreetmap-tile-server
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix apache

Browse Source
This commit is contained in:
Greg 2022-06-23 12:01:56 -04:00
parent 0c988aa518
commit f673819bd7
No known key found for this signature in database
GPG Key ID: B016D27A4C5E4363
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Dockerfile
View File

@ -89,11 +89,7 @@ RUN pip3 install \
RUN npm install -g carto@0.18.2 RUN npm install -g carto@0.18.2
# Configure Apache # Configure Apache
RUN mkdir /var/lib/mod_tile \ RUN echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf \
&& chown renderer /var/lib/mod_tile \
&& mkdir /var/run/renderd \
&& chown renderer /var/run/renderd \
&& echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf \
&& echo "LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so" >> /etc/apache2/conf-available/mod_headers.conf \ && echo "LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so" >> /etc/apache2/conf-available/mod_headers.conf \
&& a2enconf mod_tile && a2enconf mod_headers && a2enconf mod_tile && a2enconf mod_headers
COPY apache.conf /etc/apache2/sites-available/000-default.conf COPY apache.conf /etc/apache2/sites-available/000-default.conf
@ -117,23 +113,24 @@ RUN chown -R postgres:postgres /var/lib/postgresql \
&& echo "host all all ::/0 md5" >> /etc/postgresql/14/main/pg_hba.conf && echo "host all all ::/0 md5" >> /etc/postgresql/14/main/pg_hba.conf
# Create volume directories # Create volume directories
RUN mkdir -p /data/database/ \ RUN mkdir -p /run/renderd/ \
&& mkdir -p /data/database/ \
&& mkdir -p /data/style/ \ && mkdir -p /data/style/ \
&& mkdir -p /home/renderer/src/ \ && mkdir -p /home/renderer/src/ \
&& chown -R renderer: /data/ \ && chown -R renderer: /data/ \
&& chown -R renderer: /home/renderer/src/ \ && chown -R renderer: /home/renderer/src/ \
&& chown -R renderer: /run/renderd \
&& mv /var/lib/postgresql/14/main/ /data/database/postgres/ \ && mv /var/lib/postgresql/14/main/ /data/database/postgres/ \
&& mv /var/lib/mod_tile/ /data/tiles/ \ && mv /var/cache/renderd/tiles/ /data/tiles/ \
&& chown -R renderer: /data/tiles \
&& ln -s /data/database/postgres /var/lib/postgresql/14/main \ && ln -s /data/database/postgres /var/lib/postgresql/14/main \
&& ln -s /data/style /home/renderer/src/openstreetmap-carto \ && ln -s /data/style /home/renderer/src/openstreetmap-carto \
&& ln -s /data/tiles /var/lib/mod_tile \ && ln -s /data/tiles /var/cache/renderd/tiles \
; ;
# Configure renderd RUN echo '[default] \n\
RUN sed -i 's,tile_dir=.*,tile_dir=/var/lib/mod_tile/,g' /etc/renderd.conf \
&& echo '[ajt] \n\
URI=/tile/ \n\ URI=/tile/ \n\
TILEDIR=/var/lib/mod_tile \n\ TILEDIR=/var/cache/renderd/tiles \n\
XML=/home/renderer/src/openstreetmap-carto/mapnik.xml \n\ XML=/home/renderer/src/openstreetmap-carto/mapnik.xml \n\
HOST=localhost \n\ HOST=localhost \n\
TILESIZE=256 \n\ TILESIZE=256 \n\

1
apache.conf
View File

@ -1,6 +1,7 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin webmaster@localhost ServerAdmin webmaster@localhost
AddTileConfig /tile/ default
LoadTileConfigFile /etc/renderd.conf LoadTileConfigFile /etc/renderd.conf
ModTileRenderdSocketName /run/renderd/renderd.sock ModTileRenderdSocketName /run/renderd/renderd.sock
ModTileRequestTimeout 0 ModTileRequestTimeout 0