Skip to content

Commit

Permalink
Add config for the private part
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexDaniel committed Dec 17, 2023
1 parent bd26edf commit 38100e0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ RUN cat /usr/local/apache2/conf/httpd.conf-extra >> /usr/local/apache2/conf/http
COPY ./htdocs/ /usr/local/apache2/htdocs/
COPY ./cgi-bin/ /usr/local/apache2/cgi-bin/
COPY ./config/ /usr/local/apache2/config/
COPY ./config-private/ /usr/local/apache2/config-private/

# Set permissions to www-data, there's seems to be no other way to do that
RUN sed -i 's/^exec /chown -R www-data:www-data \/srv\/data\n\nexec /' /usr/local/bin/httpd-foreground
1 change: 1 addition & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
context: .
volumes:
- /home/progarm/data/progarm/data:/srv/data
- /home/progarm/data/progarm/data-private:/srv/data-private
- /home/progarm/data/progarm/logs:/srv/logs
networks:
- caddy
Expand Down
7 changes: 7 additions & 0 deletions httpd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,12 @@ SetEnv WikiDataDir /srv/data
AllowOverride All
</Directory>

Alias /private/cgi-bin/ /usr/local/apache2/cgi-bin/
<Location /private/cgi-bin >
SetEnv WikiConfigFile /usr/local/apache2/config-private/config
SetEnv WikiModuleDir /usr/local/apache2/config-private/modules
SetEnv WikiDataDir /srv/data-private
</Location>

ErrorLog /srv/logs/error.log
CustomLog /srv/logs/access.log combined

0 comments on commit 38100e0

Please sign in to comment.