Skip to content

Commit

Permalink
Merge pull request #4 from sundowndev/fix/root
Browse files Browse the repository at this point in the history
fix: site document root
  • Loading branch information
sundowndev authored Oct 22, 2023
2 parents c821145 + d731768 commit 96dbfb5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ COPY webclient.conf /etc/apache2/sites-available/webclient.conf
RUN a2ensite webclient.conf
RUN a2enmod rewrite

RUN git clone https://github.com/meganz/webclient.git /var/www/html/meganz-webclient
RUN rm -rf /var/www/html
RUN git clone https://github.com/meganz/webclient.git /var/www/html

RUN chgrp -R www-data /var/www/html
RUN chown -R www-data /var/www/html
Expand Down
4 changes: 2 additions & 2 deletions apache/webclient.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<VirtualHost *:80>
ServerName meganz-webclient
ServerAdmin webmaster@meganz-webclient
DocumentRoot /var/www/html/meganz-webclient
DocumentRoot /var/www/html
ErrorLog /var/log/apache2/meganz-webclient.error.log
CustomLog /var/log/apache2/meganz-webclient.access.log combined
LogLevel warn

<Directory "/var/www/html/meganz-webclient">
<Directory "/var/www/html">
AllowOverride All
</Directory>
</VirtualHost>

0 comments on commit 96dbfb5

Please sign in to comment.