aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritzFago <MoritzFago@users.noreply.github.com>2017-08-04 00:13:07 +0200
committerRuben Barkow <rubo77@users.noreply.github.com>2017-08-04 00:13:07 +0200
commit9bffb954ebebaf7c4c79c7ce553185e76bdb391b (patch)
treec2f60991afccf69511c948a5270b5597185d5351
parentdb4cc9196b82537a6c96437a683e9e8520d88241 (diff)
blog als submodule eingebunden und rss feed hinzugefĆ¼gt (#15)
-rw-r--r--.gitmodules3
-rw-r--r--Gemfile4
-rw-r--r--README.md33
-rw-r--r--_config.yml2
-rw-r--r--_layouts/base.html1
l---------_posts2
m---------blog0
l---------images/blog2
8 files changed, 28 insertions, 19 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..50a92e9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "blog"]
+ path = blog
+ url = https://github.com/freifunk-kiel/ffki-blog.git
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..5807319
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gem 'jekyll-feed', :git => 'https://github.com/jekyll/jekyll-feed'
+gem 'jekyll'
+gem 'nokogiri', '~> 1.6', '>= 1.6.7.2'
diff --git a/README.md b/README.md
index f2e8ee5..2974dc5 100644
--- a/README.md
+++ b/README.md
@@ -11,22 +11,16 @@ Dependencies
------------
* ruby2.0
+* bundler
-### Gems
+Install
+-------
-* nokogiri
-* jekyll
-* json
-
-On Ubuntu/Debian:
-
- sudo apt-get install ruby2.0 ruby2.0-dev ruby-nokogiri
- sudo gem install json jekyll
- ggf.:
- RUBY_VERSION=2.1
- ln -s /usr/bin/gem$RUBY_VERSION /usr/bin/gem
- sudo chmod +x /usr/bin/gem
-
+ git clone <repo-url> startseite
+ cd startseite/
+ git submodule update --init --recursive --remote
+ gem install bundler
+ bundle install
Customization
-------------
@@ -49,9 +43,13 @@ The complete directory structure of what (under Debian/Ubuntu) should reside und
jekyll build
-so it is stored in the local folder `build` outside of this repository. If something analogous to `rm -r /path/to/www; mv build /path/to/www` is no possible, you may decided for something like
+On Ubuntu you might need to ensure the right environment with
+
+ bundle exec jekyll build
+
+The generated static pages will be stored in the subfolder `_site/`, that you should move somewhere outside of this repository. If something analogous to `rm -r /path/to/www; mv _site /path/to/www` is no possible, you may decided for something like
- (cd build && tar cf - .)|(cd /path/to/www && sudo tar xf -)
+ (cd _site && tar cf - .)|(cd /path/to/www && sudo tar xf -)
to have the data transferred without deleting independent contributions.
@@ -72,4 +70,5 @@ Aftermath
There are several bits and pieces still missing after the installation of this startseite.
* map/graph/List from the ffnord/ffmap-d3 repository on github
* integration of the www-providing machine with the batman-adv mesh
- * mailing lists and email setup in general
+ * mailinglists and email setup in general
+ * ...
diff --git a/_config.yml b/_config.yml
index 1ee4f17..df0d972 100644
--- a/_config.yml
+++ b/_config.yml
@@ -62,3 +62,5 @@ tld:
- "fda1:384a:74de:4242::ff06"
- "10.116.192.1"
- "fda1:384a:74de:4242::ff07"
+plugins:
+ - jekyll-feed
diff --git a/_layouts/base.html b/_layouts/base.html
index b22ac38..a03e3d3 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -112,6 +112,7 @@
<li><a href="{{ site.community.url_graph }}">Netzgraph</a></li>
{% endif %}
<li><a href="{{ site.community.url_meshviewer }}">Meshviewer</a></li>
+ <li><a href=/feed.xml>RSS-Feed</a></li>
<li><a href="/nutzungsbedingungen.html">Nutzungsbedingungen</a></li>
<li><a href="/spenden.html">Spenden</a></li>
</ul>
diff --git a/_posts b/_posts
index 4409a44..9c93267 120000
--- a/_posts
+++ b/_posts
@@ -1 +1 @@
-/opt/ffki-blog/_posts/ \ No newline at end of file
+blog/_posts \ No newline at end of file
diff --git a/blog b/blog
new file mode 160000
+Subproject ef72cd9d9741fdca12fde0bd46f66c4422037fd
diff --git a/images/blog b/images/blog
index d67b35b..002a09a 120000
--- a/images/blog
+++ b/images/blog
@@ -1 +1 @@
-/opt/ffki-blog/images/ \ No newline at end of file
+../blog/images/ \ No newline at end of file