aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArno Richter <mail@arnorichter.de>2022-01-26 22:15:10 +0100
committerGitHub <noreply@github.com>2022-01-26 22:15:10 +0100
commit8999ab71aa99e0810d05ff4420cdca944b0936dc (patch)
treecd09fde0b55dd1ce2fcd8f07768569dda480d30d
parentde148409fe5024e662ee79a9d6a67368b727ccfb (diff)
parent79fd68680b2a04240af206025fd96acd239c41a0 (diff)
downloadmicroblog-8999ab71aa99e0810d05ff4420cdca944b0936dc.tar.gz
microblog-8999ab71aa99e0810d05ff4420cdca944b0936dc.tar.bz2
microblog-8999ab71aa99e0810d05ff4420cdca944b0936dc.zip
Merge pull request #6 from jaquer/ignore-config-file
Ignore changes to the config file.
-rw-r--r--.gitignore3
-rw-r--r--README.md2
-rw-r--r--config-dist.php (renamed from config.php)0
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index d952016..424fcc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
*.db
-feed.json \ No newline at end of file
+config.php
+feed.json
diff --git a/README.md b/README.md
index 6f5588d..6ea060f 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ For crossposting to twitter, the app uses code from [J7mbo/twitter-api-php](http
### Installation
- Copy the files to a directory on your webserver
-- edit [config.php](config.php) and adjust the settings if you like (at least set a new password!)
+- copy (or rename) [config-dist.php](config-dist.php) to config.php and adjust the settings if you like (at least set a new password!)
- for Apache: edit [.htaccess](.htaccess) and set `RewriteBase` to a path matching your installation directory
- for nginx: have a rule similar to `try_files $uri $uri/ /index.php?$args;` for the microblog-location
- optional: modify the theme file [microblog.css](microblog.css)
diff --git a/config.php b/config-dist.php
index 41c6430..41c6430 100644
--- a/config.php
+++ b/config-dist.php