Skip to content

Commit

Permalink
FIX docker-config/idp whitespace reformat
Browse files Browse the repository at this point in the history
Reformatted to follow .editorconfig rules.
  • Loading branch information
ionparticle committed Aug 30, 2024
1 parent 5ae8626 commit 819b5e5
Show file tree
Hide file tree
Showing 7 changed files with 1,704 additions and 1,704 deletions.
8 changes: 4 additions & 4 deletions docker-config/idp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ COPY --from=composer/composer:2-bin /composer /usr/bin/composer
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/

RUN apt-get update && \
apt-get -y install git curl vim && \
install-php-extensions ldap zip
apt-get -y install git curl vim && \
install-php-extensions ldap zip

# dirs used by simplesamlphp needs to be accessible by apache user
RUN mkdir simplesamlphp/ /var/cache/simplesamlphp
Expand All @@ -23,11 +23,11 @@ WORKDIR /var/www/simplesamlphp

# Generate certs
RUN cd cert/ && \
openssl req -newkey rsa:3072 -new -x509 -days 3652 -nodes -out server.crt -keyout server.pem -subj "/C=CA/SP=BC/L=Vancouver/O=UBC/CN=idp.docker"
openssl req -newkey rsa:3072 -new -x509 -days 3652 -nodes -out server.crt -keyout server.pem -subj "/C=CA/SP=BC/L=Vancouver/O=UBC/CN=idp.docker"

# Use composer to install dependencies
RUN composer install && \
composer require simplesamlphp/simplesamlphp-module-metarefresh
composer require simplesamlphp/simplesamlphp-module-metarefresh

# Copy config files
COPY ./config/ config/
Expand Down
10 changes: 5 additions & 5 deletions docker-config/idp/apache.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
# after it has been globally disabled with "a2disconf".
#Include conf-available/serve-cgi-bin.conf

SetEnv SIMPLESAMLPHP_CONFIG_DIR /var/www/simplesamlphp/config
SetEnv SIMPLESAMLPHP_CONFIG_DIR /var/www/simplesamlphp/config

Alias /simplesaml /var/www/simplesamlphp/public
Alias /simplesaml /var/www/simplesamlphp/public

<Directory /var/www/simplesamlphp/public>
Require all granted
</Directory>
<Directory /var/www/simplesamlphp/public>
Require all granted
</Directory>

</VirtualHost>
Loading

0 comments on commit 819b5e5

Please sign in to comment.