Skip to content

Commit 478ceab

Browse files
committed
Move htaccess.conf to bin/htaccess.conf
1 parent 3d527a0 commit 478ceab

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
node_js: node
4040
script: ./test/build/test_userbuild.sh
4141
before_deploy:
42-
- ./bin/build.sh dist/.htaccess htaccess.conf
43-
- ./bin/build.sh dist/h5bp.htaccess htaccess.conf
42+
- ./bin/build.sh dist/.htaccess bin/htaccess.conf
43+
- ./bin/build.sh dist/h5bp.htaccess bin/htaccess.conf
4444
deploy:
4545
- provider: releases
4646
api_key: $GITHUB_API_TOKEN

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The [**build script**](#build-script-buildsh) with its re-usable and customizabl
102102

103103
### Configuration file: *htaccess.conf*
104104

105-
Allows you to define which module to [enable](#enabling-modules) or [disable](#disabling-modules) for your project. Just copy the default [**htaccess.conf**](https://github.com/h5bp/server-configs-apache/blob/master/htaccess.conf) from this repo into your project directory. Adjust to your needs, and/or [add custom code](#adding-custom-modules) snippets you need for your project. Its syntax is straight and pretty much self-explanatory:
105+
Allows you to define which module to [enable](#enabling-modules) or [disable](#disabling-modules) for your project. Just copy the default [**htaccess.conf**](https://github.com/h5bp/server-configs-apache/blob/master/bin/htaccess.conf) from this repo into your project directory. Adjust to your needs, and/or [add custom code](#adding-custom-modules) snippets you need for your project. Its syntax is straight and pretty much self-explanatory:
106106

107107
```
108108
# Example Module
@@ -161,7 +161,7 @@ enable "config/framework_rewrites.conf"
161161
Dive into your project root and call the build script from wherever you cloned the repo. Here are three examples:
162162

163163
**1. Create a default .htaccess**
164-
in current work directory. An existing **htaccess.conf** in this directory will be used; if none is present, the [**default configuration**](https://github.com/h5bp/server-configs-apache/blob/master/htaccess.conf) will apply.
164+
in current work directory. An existing **htaccess.conf** in this directory will be used; if none is present, the [**default configuration**](https://github.com/h5bp/server-configs-apache/blob/master/bin/htaccess.conf) will apply.
165165

166166

167167
```bash

bin/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
declare htaccess_config_default="htaccess.conf";
3+
declare htaccess_config_default="bin/htaccess.conf";
44
declare htaccess_output_default="./.htaccess"
55
declare repo_root
66
repo_root=$(dirname "$(dirname "$0")")

htaccess.conf bin/htaccess.conf

File renamed without changes.

0 commit comments

Comments
 (0)