Browse Source

changing the output dir in makefile

master
mb@mb 1 year ago
parent
commit
4b413f5b33

+ 2
- 2
Makefile View File

@@ -4,7 +4,7 @@ PELICANOPTS=
4 4
 
5 5
 BASEDIR=$(CURDIR)
6 6
 INPUTDIR=$(BASEDIR)/content
7
-OUTPUTDIR=/var/www/html/
7
+OUTPUTDIR=$(BASEDIR)/output
8 8
 CONFFILE=$(BASEDIR)/pelicanconf.py
9 9
 PUBLISHCONF=$(BASEDIR)/publishconf.py
10 10
 
@@ -97,7 +97,7 @@ stopserver:
97 97
 	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
98 98
 
99 99
 publish:
100
-	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
100
+	$(PELICAN) $(INPUTDIR) -o /var/www/html/ -s $(PUBLISHCONF) $(PELICANOPTS)
101 101
 
102 102
 ssh_upload: publish
103 103
 	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)

+ 3
- 3
content/Extratonaliteit.md View File

@@ -3,8 +3,8 @@ Date: 2018-02-16
3 3
 Category: event
4 4
 Slug: extratonality NL
5 5
 lang: nl
6
-event_start: 2018-02-16 20:00
7
-event_duration: 3h
6
+event-start: 2018-02-16 20:00
7
+event-duration: 3h
8 8
 
9 9
 ![extratonality](/images/Extra.jpg)
10 10
 
@@ -14,4 +14,4 @@ Datum: Vrijdag 16 Februari
14 14
 Deuren: 20:00
15 15
 Begin: 20:30
16 16
 
17
-Entree: Donatie
17
+Entree: Donatie

+ 3
- 3
content/Extratonality.md View File

@@ -3,8 +3,8 @@ Date: 2018-02-16
3 3
 Category: event
4 4
 Slug: extratonality
5 5
 lang: en
6
-event_start: 2018-02-16 20:00
7
-event_duration: 3h
6
+event-start: 2018-02-16 20:00
7
+event-duration: 3h
8 8
 
9 9
 ![extratonality](/images/Extra.jpg)
10 10
 
@@ -12,4 +12,4 @@ In a time where problems are designed to be solutions, and industrialised rubbis
12 12
 
13 13
 Date: Friday 16 February
14 14
 Doors: 20:00
15
-Start: 20:30
15
+Start: 20:30

+ 2
- 2
content/Nieuwjaarsborrel.en.md View File

@@ -3,8 +3,8 @@ Date: 2018-01-19
3 3
 Category: event 
4 4
 Slug: nieuwjaarsborrel
5 5
 lang: en
6
-event_start: 2018-01-19 18:00 
7
-event_duration: 5h 
6
+event-start: 2018-01-19 18:00 
7
+event-duration: 5h 
8 8
 
9 9
 ![robomop](/images/nieuwjaarsborrel.png)
10 10
 

+ 2
- 2
content/Nieuwjaarsborrel.md View File

@@ -3,8 +3,8 @@ Date: 2018-01-19
3 3
 Category: event
4 4
 Slug: nieuwjaarsborrel
5 5
 lang: nl
6
-event_start: 2018-01-19 18:00
7
-event_duration: 5h
6
+event-start: 2018-01-19 17:00
7
+event-duration: 5h
8 8
 
9 9
 ![robomop](/images/nieuwjaarsborrel.png)
10 10
 

+ 2
- 2
content/ccc-screening.en.md View File

@@ -3,8 +3,8 @@ Date: 2017-12-15
3 3
 Category: event
4 4
 Slug: ccc-screening
5 5
 lang: en
6
-event_start: 2017-12-27 11:00
7
-event_end: 2017-12-30 18:15
6
+event-start: 2017-12-27 11:00
7
+event-end: 2017-12-30 18:15
8 8
 
9 9
 ![34c3 logo](/images/ccc-2017.jpg)
10 10
 

+ 2
- 2
content/ccc-screening.nl.md View File

@@ -3,8 +3,8 @@ Date: 2017-12-15
3 3
 Category: event
4 4
 Slug: ccc-screening
5 5
 lang: nl
6
-event_start: 2017-12-27 11:00
7
-event_end: 2017-12-30 18:15
6
+event-start: 2017-12-27 11:00
7
+event-end: 2017-12-30 18:15
8 8
 
9 9
 ![34c3 logo](/images/ccc-2017.jpg)
10 10
 

+ 2
- 2
content/hbsc-cal-1.en.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-09
3 3
 Category: gathering
4 4
 Slug: hbsc-cal-1-en
5 5
 lang: en
6
-event_start: 2017-11-16 19:00
7
-event_duration: 3h
6
+event-start: 2017-11-16 19:00
7
+event-duration: 3h
8 8
 
9 9
 ![map preview](/images/cal.png)
10 10
 

+ 2
- 2
content/hbsc-cal-1.nl.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-09
3 3
 Category: gathering
4 4
 Slug: hbsc-cal-1-nl
5 5
 lang: nl
6
-event_start: 2017-11-16 19:00
7
-event_duration: 3h
6
+event-start: 2017-11-16 19:00
7
+event-duration: 3h
8 8
 
9 9
 ![map preview](/images/cal.png)
10 10
 

+ 2
- 2
content/hbsc-cal-2.en.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-22
3 3
 Category: gathering
4 4
 Slug: hbsc-cal-2-en
5 5
 lang: en
6
-event_start: 2017-11-30 19:00
7
-event_duration: 3h
6
+event-start: 2017-11-30 19:00
7
+event-duration: 3h
8 8
 
9 9
 ![map preview](/images/cal2.png)
10 10
 

+ 2
- 2
content/hbsc-cal-2.nl.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-22
3 3
 Category: gathering
4 4
 Slug: hbsc-cal-2-nl
5 5
 lang: nl
6
-event_start: 2017-11-30 19:00
7
-event_duration: 3h
6
+event-start: 2017-11-30 19:00
7
+event-duration: 3h
8 8
 
9 9
 ![map preview](/images/cal2.png)
10 10
 

+ 2
- 2
content/inox.en.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-26
3 3
 Category: event
4 4
 Slug: inox-kapell
5 5
 lang: en
6
-event_start: 2017-12-16 19:00
7
-event_duration:4h
6
+event-start: 2017-12-16 19:00
7
+event-duration:4h
8 8
 
9 9
 ![Inox Kapell](/images/insekt.jpg )
10 10
 

+ 2
- 2
content/inox.nl.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-26
3 3
 Category: event
4 4
 Slug: inox-kapell
5 5
 lang: nl
6
-event_start: 2017-12-16 19:00
7
-event_duration:4h
6
+event-start: 2017-12-16 19:00
7
+event-duration:4h
8 8
 
9 9
 
10 10
 ![Inox Kapell](/images/insekt.jpg)

+ 3
- 3
content/relearn.en.md View File

@@ -3,9 +3,9 @@ Date: 2017-08-29
3 3
 Category: projects
4 4
 Slug: relearn
5 5
 lang: en
6
-event_start: 2017-08-29 10:00
7
-event_end: 2017-09-02 19:30
8
-event_duration: 8h
6
+event-start: 2017-08-29 10:00
7
+event-end: 2017-09-02 19:30
8
+event-duration: 8h
9 9
 
10 10
 ![test image](/images/pg.jpg)
11 11
 

+ 3
- 3
content/relearn.nl.md View File

@@ -3,9 +3,9 @@ Date: 2017-08-29
3 3
 Category: projects
4 4
 Slug: relearn
5 5
 lang: nl
6
-event_start: 2017-08-29 10:00
7
-event_end: 2017-09-02 19:30
8
-event_duration: 8h
6
+event-start: 2017-08-29 10:00
7
+event-end: 2017-09-02 19:30
8
+event-duration: 8h
9 9
 
10 10
 ![relearn](/images/pg.jpg)
11 11
 

+ 2
- 2
content/samenscholing.en.md View File

@@ -4,8 +4,8 @@ Category: project
4 4
 Slug: samenscholing
5 5
 lang: en
6 6
 Status: draft
7
-event_start: 2017-12-31 19:30
8
-event_duration: 3h
7
+event-start: 2017-12-31 19:30
8
+event-duration: 3h
9 9
 
10 10
 ![test image](/images/schoolbells.jpg)
11 11
 

+ 2
- 2
content/samenscholing.nl.md View File

@@ -4,8 +4,8 @@ Category: projects
4 4
 Slug: samenscholing
5 5
 lang: nl
6 6
 Status: draft
7
-event_start: 2017-12-31 19:30
8
-event_duration: 3h
7
+event-start: 2017-12-31 19:30
8
+event-duration: 3h
9 9
 
10 10
 ![test image](/images/schoolbells.jpg)
11 11
 

+ 2
- 2
content/sdr-workshop.en.md View File

@@ -4,8 +4,8 @@ Category: curriculum
4 4
 Slug: sdr-intro
5 5
 lang: en
6 6
 Status: draft
7
-event_start: 2017-12-31 12:00
8
-event_duration:4h
7
+event-start: 2017-12-31 12:00
8
+event-duration:4h
9 9
 
10 10
 ![This is not an SDR](/images/radio.jpg)
11 11
 

+ 2
- 2
content/sounduncloud.en.md View File

@@ -2,8 +2,8 @@ Title: Sounduncloud: A Rogue Archiving Workshop
2 2
 Category: curriculum
3 3
 Slug: sounduncloud
4 4
 lang: en
5
-event_start: 2017-12-01 12:00
6
-event_duration:6h
5
+event-start: 2017-12-01 12:00
6
+event-duration:6h
7 7
 status: draft
8 8
 
9 9
 ![Offline listening for days!](/images/offline_listening.png)

+ 2
- 2
content/sounduncloud.nl.md View File

@@ -2,8 +2,8 @@ Title: Sounduncloud: A Rogue Archiving Workshop
2 2
 Category: curriculum
3 3
 Slug: sounduncloud
4 4
 lang: nl
5
-event_start: 2017-12-01 12:00
6
-event_duration: 6h
5
+event-start: 2017-12-01 12:00
6
+event-duration: 6h
7 7
 status: draft
8 8
 
9 9
 ![Offline listening for days!](/images/offline_listening.png)

+ 2
- 2
content/the-secret-life-seizoen-1.en.md View File

@@ -3,8 +3,8 @@ Date: 2017-10-29
3 3
 Category: screening
4 4
 Slug: the-secret-life-season-1
5 5
 lang: en
6
-event_start: 2017-11-05 19:30
7
-event_duration:3h
6
+event-start: 2017-11-05 19:30
7
+event-duration:3h
8 8
 
9 9
 ![folding chains](/images/secret_life_chain.gif)
10 10
 

+ 2
- 2
content/the-secret-life-seizoen-1.nl.md View File

@@ -3,8 +3,8 @@ Date: 2017-10-29
3 3
 Category: event
4 4
 Slug: the-secret-life-seizoen-1
5 5
 lang: nl
6
-event_start: 2017-11-05 19:30
7
-event_duration:3h
6
+event-start: 2017-11-05 19:30
7
+event-duration:3h
8 8
 
9 9
 ![folding chains](/images/secret_life_chain.gif)
10 10
 

+ 2
- 2
content/the-secret-life-seizoen-2.en.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-12
3 3
 Category: screening
4 4
 Slug: the-secret-life-2
5 5
 lang: en
6
-event_start: 2017-11-19 16:30
7
-event_duration: 4h
6
+event-start: 2017-11-19 16:30
7
+event-duration: 4h
8 8
 
9 9
 ![folding chains](/images/fire.gif)
10 10
 

+ 2
- 2
content/the-secret-life-seizoen-2.nl.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-12
3 3
 Category: screening
4 4
 Slug: the-secret-life-2
5 5
 lang: nl
6
-event_start: 2017-11-19 16:30
7
-event_duration: 4h
6
+event-start: 2017-11-19 16:30
7
+event-duration: 4h
8 8
 
9 9
 ![folding chains](/images/fire.gif)
10 10
 

+ 2
- 2
content/the-secret-life-seizoen-3.en.2.md View File

@@ -3,8 +3,8 @@ Date: 2017-12-15
3 3
 Category: screening
4 4
 Slug: the-secret-life-screening-3.2
5 5
 lang: en
6
-event_start: 2017-12-20 19:30
7
-event_duration: 3h
6
+event-start: 2017-12-20 19:30
7
+event-duration: 3h
8 8
 
9 9
 ![word processor robot](/images/word_processor_robot.gif)
10 10
 

+ 2
- 2
content/the-secret-life-seizoen-3.en.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-23
3 3
 Category: screening
4 4
 Slug: the-secret-life-screening-3
5 5
 lang: en
6
-event_start: 2017-12-10 19:30
7
-event_duration: 3h
6
+event-start: 2017-12-10 19:30
7
+event-duration: 3h
8 8
 
9 9
 ![word processor robot](/images/word_processor_robot.gif)
10 10
 

+ 2
- 2
content/the-secret-life-seizoen-3.nl.2.md View File

@@ -3,8 +3,8 @@ Date: 2017-12-15
3 3
 Category: event
4 4
 Slug: the-secret-life-3.2
5 5
 lang: nl
6
-event_start: 2017-12-20 19:30
7
-event_duration: 3h
6
+event-start: 2017-12-20 19:30
7
+event-duration: 3h
8 8
 
9 9
 ![word processor robot](/images/word_processor_robot.gif )
10 10
 

+ 2
- 2
content/the-secret-life-seizoen-3.nl.md View File

@@ -3,8 +3,8 @@ Date: 2017-11-23
3 3
 Category: event
4 4
 Slug: the-secret-life-3
5 5
 lang: nl
6
-event_start: 2017-12-10 19:30
7
-event_duration: 3h
6
+event-start: 2017-12-10 19:30
7
+event-duration: 3h
8 8
 
9 9
 ![word processor robot](/images/word_processor_robot.gif )
10 10
 

+ 2
- 2
pelicanconf.py View File

@@ -57,7 +57,7 @@ I18N_SUBSITES = {
57 57
 }	
58 58
 
59 59
 PLUGIN_EVENTS = {
60
-	'ics_calendars': ['event.ics', 'curriculum.ics'],
60
+	'ics_calendars': ['events.ics', 'curriculum.ics'],
61 61
 	'default_location' : '',
62
-	'calendar_per_category': True
62
+	'calendar_per_category': False
63 63
 }

+ 1
- 1
plugins-custom

@@ -1 +1 @@
1
-Subproject commit 1cbfe0e6b31f0155f6294f052cbe110c6c0fb2c3
1
+Subproject commit 466d35a876bceae4b8a3429b0121703ba8366067

Loading…
Cancel
Save