Skip to content

Commit eb02819

Browse files
author
Bernhard B
committed
Merge branch 'develop'
2 parents 2c11829 + a2b20d6 commit eb02819

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2659
-1135
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The following section contains some notes on how to set up your own instance to
2626
This should only give you an idea how you *could* configure your system. Of course you are totally free in choosing
2727
a different linux distribution, tools and scripts. If you are only interested in how to compile ImageMonkey, then you can jump directly to the *Build Application* section
2828

29-
*Info:* Some commands are distribution (Debian 9.1) specific and may not work on your system.
29+
*Info:* Some commands are distribution (Debian 10) specific and may not work on your system.
3030

3131
### Base System Configuration ###
3232

conf/nginx/nginx.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ events {
1313

1414

1515
http{
16-
limit_req_zone $binary_remote_addr zone=general:20m rate=4r/s;
16+
limit_req_zone $binary_remote_addr zone=general:20m rate=15r/s;
1717

1818
include /etc/nginx/mime.types;
1919

conf/supervisor/imagemonkey-bot.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[program:imagemonkey-bot]
22
process_name=imagemonkey-bot%(process_num)s
3-
command=/home/imagemonkey/bin/bot -use_sentry=true -labels_repository_name=imagemonkey-labels -labels_repository_owner=bbernhard -singleshot=false -git_checkout_dir=/tmp/labelsbot-checkout -polling_interval=10
3+
command=/home/imagemonkey/bin/bot -use_sentry=true -labels_repository_name=imagemonkey-labels -labels_repository_owner=ImageMonkey -singleshot=false -git_checkout_dir=/tmp/labelsbot-checkout -polling_interval=10
44
autostart=true
55
autorestart=true
66
startretries=10

css/common.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,7 @@
151151
.pusher > .footer {
152152
flex: 1;
153153
}
154+
155+
.default-text {
156+
font-size: 1.33em;
157+
}

html/static/blog/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
README
22
======
33

4+
# Install
5+
* Install jekyll as described [here](https://jekyllrb.com/docs/installation/)
6+
* Execute `bundle install` in the `imagemonkey-blog` folder to install dependencies
7+
8+
# Build + Run
9+
* Execute `bundle exec jekyll build` in the `imagemonkey-blog` folder to generate the sites
10+
* Execute `bundle exec jekyll serve` in the `imagemonkey-blog` folder to run it
11+
3.96 MB
Loading
98.9 KB
Loading
70.7 KB
Loading
244 KB
Loading
65.8 KB
Loading

0 commit comments

Comments
 (0)