Skip to content

Commit c77cd01

Browse files
KrinkleKrinkle
committed
build: normalize LF for source code
1 parent ab3a034 commit c77cd01

File tree

7 files changed

+204
-195
lines changed

7 files changed

+204
-195
lines changed

‎.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MYSQL_DATABASE=
22
MYSQL_ROOT_PASSWORD=
33
MYSQL_USER=
4-
MYSQL_PASSWORD=
4+
MYSQL_PASSWORD=

‎.gitattributes

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Normalize to LF for source code
5+
.htaccess eol=lf
6+
*.conf eol=lf
7+
*.php eol=lf
8+
*.yml eol=lf
9+
*.md eol=lf

‎.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
wp-config.php
2-
ssl/*.pem
3-
.env
4-
*.sql
1+
wp-config.php
2+
ssl/*.pem
3+
.env
4+
*.sql

‎apache/.htaccess

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
RewriteEngine On
2-
RewriteBase /
3-
RewriteRule ^index\.php$ - [L]
4-
5-
RewriteRule ^resources/?$ index.php [L]
6-
RewriteRule ^resources/(.+) gw-resources/%{HTTP_HOST}/$1 [L]
7-
8-
# Add a trailing slash to the wp-admin of a subsite.
9-
RewriteRule ^([_0-9a-zA-Z\.-]+/)?wp-admin$ $1wp-admin/ [R=301,L]
10-
11-
RewriteCond %{REQUEST_FILENAME} -f [OR]
12-
RewriteCond %{REQUEST_FILENAME} -d
13-
RewriteRule ^ - [L]
14-
15-
# Handle wp-admin, wp-includes, and root PHP files for subsites.
16-
RewriteRule ^[_0-9a-zA-Z\.-]+/((wp-admin|wp-includes).*) $1 [L]
17-
RewriteRule ^[_0-9a-zA-Z\.-]+/(.*\.php)$ $1 [L]
18-
19-
RewriteRule . index.php [L]
1+
RewriteEngine On
2+
RewriteBase /
3+
RewriteRule ^index\.php$ - [L]
4+
5+
RewriteRule ^resources/?$ index.php [L]
6+
RewriteRule ^resources/(.+) gw-resources/%{HTTP_HOST}/$1 [L]
7+
8+
# Add a trailing slash to the wp-admin of a subsite.
9+
RewriteRule ^([_0-9a-zA-Z\.-]+/)?wp-admin$ $1wp-admin/ [R=301,L]
10+
11+
RewriteCond %{REQUEST_FILENAME} -f [OR]
12+
RewriteCond %{REQUEST_FILENAME} -d
13+
RewriteRule ^ - [L]
14+
15+
# Handle wp-admin, wp-includes, and root PHP files for subsites.
16+
RewriteRule ^[_0-9a-zA-Z\.-]+/((wp-admin|wp-includes).*) $1 [L]
17+
RewriteRule ^[_0-9a-zA-Z\.-]+/(.*\.php)$ $1 [L]
18+
19+
RewriteRule . index.php [L]

‎apache/000-default.conf

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
# <VirtualHost *:80>
2-
# ServerAdmin admin@localhost
3-
# ServerName localhost
4-
# DocumentRoot /var/www/html
5-
# ErrorLog ${APACHE_LOG_DIR}/error.log
6-
# CustomLog ${APACHE_LOG_DIR}/access.log combined
7-
# </VirtualHost>
8-
9-
# <VirtualHost *:443>
10-
# SSLEngine on
11-
# SSLCertificateFile /etc/apache2/ssl/cert.pem
12-
# SSLCertificateKeyFile /etc/apache2/ssl/cert-key.pem
13-
14-
# ServerAdmin admin@localhost
15-
# ServerName localhost
16-
# DocumentRoot /var/www/html
17-
# ErrorLog ${APACHE_LOG_DIR}/error.log
18-
# CustomLog ${APACHE_LOG_DIR}/access.log combined
19-
# </VirtualHost>
20-
21-
<VirtualHost *:80>
22-
ServerName local.jquery.com
23-
ServerAlias *.jquery.com *.jqueryui.com *.jquery.org *.sizzlejs.com *.jquerymobile.com
24-
DocumentRoot /var/www/html
25-
php_value memory_limit 1024M
26-
<Directory /var/www/html>
27-
Options All
28-
AllowOverride All
29-
Order allow,deny
30-
Allow from all
31-
</Directory>
32-
</VirtualHost>
33-
34-
<VirtualHost *:443>
35-
SSLEngine on
36-
SSLCertificateFile /etc/apache2/ssl/cert.pem
37-
SSLCertificateKeyFile /etc/apache2/ssl/cert-key.pem
38-
39-
ServerName local.jquery.com
40-
ServerAlias *.jquery.com *.jqueryui.com *.jquery.org *.sizzlejs.com *.jquerymobile.com
41-
DocumentRoot /var/www/html
42-
php_value memory_limit 1024M
43-
<Directory /var/www/html>
44-
Options All
45-
AllowOverride All
46-
Order allow,deny
47-
Allow from all
48-
</Directory>
49-
</VirtualHost>
1+
# <VirtualHost *:80>
2+
# ServerAdmin admin@localhost
3+
# ServerName localhost
4+
# DocumentRoot /var/www/html
5+
# ErrorLog ${APACHE_LOG_DIR}/error.log
6+
# CustomLog ${APACHE_LOG_DIR}/access.log combined
7+
# </VirtualHost>
8+
9+
# <VirtualHost *:443>
10+
# SSLEngine on
11+
# SSLCertificateFile /etc/apache2/ssl/cert.pem
12+
# SSLCertificateKeyFile /etc/apache2/ssl/cert-key.pem
13+
14+
# ServerAdmin admin@localhost
15+
# ServerName localhost
16+
# DocumentRoot /var/www/html
17+
# ErrorLog ${APACHE_LOG_DIR}/error.log
18+
# CustomLog ${APACHE_LOG_DIR}/access.log combined
19+
# </VirtualHost>
20+
21+
<VirtualHost *:80>
22+
ServerName local.jquery.com
23+
ServerAlias *.jquery.com *.jqueryui.com *.jquery.org *.sizzlejs.com *.jquerymobile.com
24+
DocumentRoot /var/www/html
25+
php_value memory_limit 1024M
26+
<Directory /var/www/html>
27+
Options All
28+
AllowOverride All
29+
Order allow,deny
30+
Allow from all
31+
</Directory>
32+
</VirtualHost>
33+
34+
<VirtualHost *:443>
35+
SSLEngine on
36+
SSLCertificateFile /etc/apache2/ssl/cert.pem
37+
SSLCertificateKeyFile /etc/apache2/ssl/cert-key.pem
38+
39+
ServerName local.jquery.com
40+
ServerAlias *.jquery.com *.jqueryui.com *.jquery.org *.sizzlejs.com *.jquerymobile.com
41+
DocumentRoot /var/www/html
42+
php_value memory_limit 1024M
43+
<Directory /var/www/html>
44+
Options All
45+
AllowOverride All
46+
Order allow,deny
47+
Allow from all
48+
</Directory>
49+
</VirtualHost>

‎docker-compose.yml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
version: '3.8'
2-
services:
3-
jquerysite:
4-
depends_on:
5-
- jquerydb
6-
build:
7-
context: .
8-
dockerfile: Dockerfile
9-
container_name: jquerysite
10-
env_file:
11-
- .env
12-
environment:
13-
- WORDPRESS_DB_HOST=jquerydb:3306
14-
- WORDPRESS_DB_USER=$MYSQL_USER
15-
- WORDPRESS_DB_PASSWORD=$MYSQL_PASSWORD
16-
- WORDPRESS_DB_NAME=$MYSQL_DATABASE
17-
volumes:
18-
- ./jquery-wp-content:/var/www/html/jquery-wp-content
19-
- ./uploads:/var/www/html/wp-content/uploads:rw
20-
- ./wp-config.php:/var/www/html/wp-config.php
21-
- ./ssl:/etc/apache2/ssl
22-
- ./apache/.htaccess:/var/www/html/.htaccess
23-
- ./apache/000-default.conf:/etc/apache2/sites-available/000-default.conf
24-
ports:
25-
- "80:80"
26-
- "443:443"
27-
networks:
28-
- jquerynet
29-
30-
jquerydb:
31-
image: mysql
32-
container_name: jquerydb
33-
restart: unless-stopped
34-
env_file:
35-
- .env
36-
volumes:
37-
- jquerydbdata:/var/lib/mysql
38-
command: '--default-authentication-plugin=mysql_native_password'
39-
ports:
40-
- "3306:3306"
41-
networks:
42-
- jquerynet
43-
44-
volumes:
45-
jquerydbdata:
46-
47-
networks:
48-
jquerynet:
49-
driver: bridge
1+
version: '3.8'
2+
services:
3+
jquerysite:
4+
depends_on:
5+
- jquerydb
6+
build:
7+
context: .
8+
dockerfile: Dockerfile
9+
container_name: jquerysite
10+
env_file:
11+
- .env
12+
environment:
13+
- WORDPRESS_DB_HOST=jquerydb:3306
14+
- WORDPRESS_DB_USER=$MYSQL_USER
15+
- WORDPRESS_DB_PASSWORD=$MYSQL_PASSWORD
16+
- WORDPRESS_DB_NAME=$MYSQL_DATABASE
17+
volumes:
18+
- ./jquery-wp-content:/var/www/html/jquery-wp-content
19+
- ./uploads:/var/www/html/wp-content/uploads:rw
20+
- ./wp-config.php:/var/www/html/wp-config.php
21+
- ./ssl:/etc/apache2/ssl
22+
- ./apache/.htaccess:/var/www/html/.htaccess
23+
- ./apache/000-default.conf:/etc/apache2/sites-available/000-default.conf
24+
ports:
25+
- "80:80"
26+
- "443:443"
27+
networks:
28+
- jquerynet
29+
30+
jquerydb:
31+
image: mysql
32+
container_name: jquerydb
33+
restart: unless-stopped
34+
env_file:
35+
- .env
36+
volumes:
37+
- jquerydbdata:/var/lib/mysql
38+
command: '--default-authentication-plugin=mysql_native_password'
39+
ports:
40+
- "3306:3306"
41+
networks:
42+
- jquerynet
43+
44+
volumes:
45+
jquerydbdata:
46+
47+
networks:
48+
jquerynet:
49+
driver: bridge

0 commit comments

Comments
 (0)