diff options
| -rw-r--r-- | zola/content/blog/music-list.md | 79 | ||||
| -rw-r--r-- | zola/content/blog/tor-at-home-experience.md | 44 | ||||
| -rw-r--r-- | zola/templates/page.html | 6 | ||||
| -rw-r--r-- | zola/templates/section.html | 6 |
4 files changed, 115 insertions, 20 deletions
diff --git a/zola/content/blog/music-list.md b/zola/content/blog/music-list.md index 4826cf5..f3e581b 100644 --- a/zola/content/blog/music-list.md +++ b/zola/content/blog/music-list.md @@ -2,7 +2,7 @@ title = "My List of Music" description = "A list of songs and albums I recomend listening to" date = 2025-02-26 -updated = 2025-06-02 +updated = 2025-06-09 authors = ["Nicolás Dato"] [taxonomies] @@ -54,6 +54,15 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. - [Queen](https://en.wikipedia.org/wiki/Queen_(band)) - Rare: [Under Pressure - Annie Lennox & David Bowie](https://www.youtube.com/watch?v=fCP2-Bfhy04) - This is from [The Freddie Mercury Tribute Concert for AIDS Awareness](https://en.wikipedia.org/wiki/The_Freddie_Mercury_Tribute_Concert), 5 months after [Freddie Mercury](https://en.wikipedia.org/wiki/Freddie_Mercury) died. + - [Bohemian Rhapsody](https://www.youtube.com/watch?v=bSnlKl_PoQU) + - [We Are the Champions](https://www.youtube.com/watch?v=04854XqcfCY) + - [Don't Stop Me Now](https://www.youtube.com/watch?v=HgzGwKwLmgM) + - [I Want It All](https://www.youtube.com/watch?v=hFDcoX7s6rE) + - [Crazy Little Thing Called Love](https://www.youtube.com/watch?v=zO6D_BAuYCI) + - [Somebody to Love](https://www.youtube.com/watch?v=EKpHL483Bzw) + - [I Want to Break Free](https://www.youtube.com/watch?v=WUOtCLOXgm8) + - [Love of My Life](https://www.youtube.com/watch?v=2bqm4gRY3mA) + - Cover, Live: [Jailhouse Rock](https://www.youtube.com/watch?v=AhpU0zGMyr0&t=39) - [Deep Purple](https://en.wikipedia.org/wiki/Deep_Purple) - [Sometimes I Feel Like Screaming](https://www.youtube.com/watch?v=K3WAC7CZTDA) - [Highway Star](https://www.youtube.com/watch?v=lC4gKA4ezcU) @@ -71,7 +80,7 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. - [Uriah Heep](https://en.wikipedia.org/wiki/Uriah_Heep_(band)) - I don't like much songs from them, but there are a few that I like. - [Lady in Black](https://www.youtube.com/watch?v=fipplWIr1SY) - - My favourite song by they. + - My favourite song by them. - [Easy Livin'](https://www.youtube.com/watch?v=jIdmWA8hxo4) - [The Wizard](https://www.youtube.com/watch?v=lA4DFOCwnwk) - [Look at Yourself](https://www.youtube.com/watch?v=nMMrazRIdx4) @@ -91,6 +100,7 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. - [Roundabout](https://www.youtube.com/watch?v=cPCLFtxpadE) ### Argentinian Rock + - [Charly García](https://en.wikipedia.org/wiki/Charly_Garc%C3%ADa) / [Serú Girán](https://en.wikipedia.org/wiki/Ser%C3%BA_Gir%C3%A1n) / [Sui Generis](https://en.wikipedia.org/wiki/Sui_Generis) - [Promesas Sobre el Bidet](https://www.youtube.com/watch?v=7oMApe1k-o4) - *Cada cual tiene un trip en el bocho, difícil que lleguemos a ponernos de acuerdo.* @@ -148,19 +158,20 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. - Album: [Rising](https://www.youtube.com/watch?v=dDO-Kk9956g&list=OLAK5uy_lfRIB-1n-NR3z1skG8PdOm2IJa0O6x6Ko) - [Megadeth](https://en.wikipedia.org/wiki/Megadeth) - Marty Friedman was here too, from 1990 until 2000. + - [In My Darkest Hour](https://www.youtube.com/watch?v=psu9D1Qgt_I) + - I was introduced to this song by a friend, who really liked the part that Mustaine says _bitch_. - [Holy Wars... the Punishment Due](https://www.youtube.com/watch?v=J5o8Daw1ZsY) - [Hangar 18](https://www.youtube.com/watch?v=x5A9Aa-WU5E) - [Tornado of Souls](https://www.youtube.com/watch?v=sONL6QUMR9E) - This on has a great guitar solo. - Album: [Rust in Peace](https://www.youtube.com/watch?v=9d4ui9q7eDM&list=OLAK5uy_lBLXRW43EViiE9xRRCR6l1Ghtj1Ko6Mhc&index=1) - One of the top albums of all time, and I wanted to highlight the previous 3 songs, from Rust in Peace, with Marty Friedman. - - [In My Darkest Hour](https://www.youtube.com/watch?v=psu9D1Qgt_I) - - I was introduced to this song by a friend, who really liked the part that Mustaine says _bitch_. - [Peace Sells](https://www.youtube.com/watch?v=LVhJy-CR64Q) - [Symphony of Destruction](https://www.youtube.com/watch?v=WdoXZf-FZyA) - *Megadeth, Megadeth, aguante Megadeth!* This is a good song, but I specially included it because of the *aguante Megadeth* chant. - [Here is Mustaine talking about that](https://www.youtube.com/watch?v=69yQhlBo8iE), and [also here too](https://www.youtube.com/watch?v=15g7-Xx0vVw). He said he thought that aguante meant tequila. - It is said to have started in 1994, and Mustaine didn't know what was going on so he stopped singing to pay attention. [Here is the video](https://www.youtube.com/watch?v=nkhkzTUsLqI), it happens in the first 45 seconds. + - [She Wolf](https://www.youtube.com/watch?v=Qcy07OvWdl0) - [Mechanix](https://www.youtube.com/watch?v=kfTcE89sBXU) - *There are two ways you can hear this next song. There is our way, and there is their way* - Mustaine wrote Mechanix before joining Metallica (our way). Then Metallica used Mechanix to write the song [The Four Horsemen](https://www.youtube.com/watch?v=-zKOhVSERS8) (their way). @@ -170,10 +181,10 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. - So [Trust](https://www.youtube.com/watch?v=flsC1YdwARE) but with the chorus in spanish, both versions are very good. - [Black Sabbath](https://en.wikipedia.org/wiki/Black_Sabbath) - Some people say Black Sabbath is the father of Heavy Metal. - - [Fluff](https://www.youtube.com/watch?v=OVWW0XD6v2Q) - - I like this one because I like it, and because it is instrumetal and acustic. - Album: [Heaven and Hell](https://www.youtube.com/watch?v=OnWsRUKGDeo) - Ronnie James Dio is the singer here. This is an excellent album, and Dio's voice makes it better. I love Dio's voice. + - [Fluff](https://www.youtube.com/watch?v=OVWW0XD6v2Q) + - I like this one because I like it, and because it is instrumetal and acustic. - Cover, Rare: [Blue Suede Shoes](https://www.youtube.com/watch?v=3Gl5I8vWmmA) - Rare, Live: [Black Sabbath w/ Rob Halford](https://www.youtube.com/watch?v=lHyUyPPipJw) - This is rare, but someone I don't like Halford's voice with Black Sabbath. I prefer Dio over Ozzy, and Ozzy over Halford (in Black Sabbath). @@ -186,7 +197,18 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. - [Stars](https://www.youtube.com/watch?v=G5H94GHb-10) - This would be the [We are the World](https://www.youtube.com/watch?v=mIqhl0rH0Wc) of Heavy Metal. - [Judas Priest](https://en.wikipedia.org/wiki/Judas_Priest) - - Cover: [Diamonds and Rust - Joan Baez](https://www.youtube.com/watch?v=Hm25FhH9vqs) + - [Breaking the Law](https://www.youtube.com/watch?v=L397TWLwrUU) + - And the video is good too! + - [The Hellion + Electric Eye](https://www.youtube.com/watch?v=eGtwgYt_QnA) + - Cover: [Diamonds and Rust](https://www.youtube.com/watch?v=Hm25FhH9vqs) + - [Jawbreaker](https://www.youtube.com/watch?v=hwu6epsjGhI) + - Cover: [Jawbreaker - Burning Witches](https://www.youtube.com/watch?v=Ek17qE4V9b8) + - [Eat Me Alive](https://www.youtube.com/watch?v=l7wYGjLvgJw) + - [Hell Bent for Leather](https://www.youtube.com/watch?v=YXJtz1TgmIM) + - [Freewheel Burning](https://www.youtube.com/watch?v=2-vZrzbE9f4) + - [Ram it Down](https://www.youtube.com/watch?v=v0jVb9TmfRM) + - Cover: [Johnny B. Goode](https://www.youtube.com/watch?v=2zxoGFjFJlk) + - Cover: [Electric Eye - Helloween](https://www.youtube.com/watch?v=sFqAiiRtySc) - [Rammstein](https://en.wikipedia.org/wiki/Rammstein) - I like Rammstein a lot, there is something special in their songs. Maybe it's because I don't understand the lyrics. And I enjoy their new albums, something that usually doesn't happen with other bands. - [Engel](https://www.youtube.com/watch?v=x2rQzv8OWEY) @@ -214,11 +236,19 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. - I think this is one of the best bands. I don't know much music, but I like and enjoy their sophistication. - [Metropolis - Part I - The Miracle and the Sleeper](https://www.youtube.com/watch?v=IqqRx77T4Vo) - A masterpiece. Listen. Enjoy. Pay attention. + - Album: [Metropolis Pt 2: Scenes From a Memory](https://www.youtube.com/watch?v=H2UHWFU5uFY&list=OLAK5uy_mY0UJ7SdDG7n4DgXGJ_h-vG0QH9LpayaA) + - *"Close your eyes and begin to relax. Take a deep breath and let it out slowly. Concentrate on your breathing with each breath you become more relaxed. Imagine a brilliant white light above you, focus in on this light as it flows through your body. Allow yourself to drift off as you fall deeper and deeper into a more relaxed state of mind. Now, as I count back from ten to one, you will feel more peaceful and calm. Ten, nine, eight, seven, six. You will enter a safe place where nothing can harm you. Five, four, three, two. If at any time you need to come back, all you need to do is open your eyes. One.* + - This is an album to listen from start to end, in order, all songs are awesome. Each song is connected to the following, and the whole album tells a story. + - The album is a story about love, affair, and murder. I didn't know that until recently as I didn't understand much of the lyrics. I did know that there was someone called like me, Nicolás (actually Nicholas). + - Live, Album: [Live Scenes from New York](https://www.youtube.com/watch?v=axz4ktJnCpE&list=PLU1rrsc1fMcNOG8rf-iBXmczZy5tN5ECM) + - Here is the Metropolis Pt 2 album played live - [The Dance of Eternity](https://www.youtube.com/watch?v=eYCYGpu0OxM) - There is a moment with drums that is very complex and awesome. [Here is Mike Portnoy showing how to count the tempo of that part](https://www.youtube.com/watch?v=vswDu3IlUbg). + - [Panic Attack](https://www.youtube.com/watch?v=cs8rkoouPSU) - [Stream of Consciousness](https://www.youtube.com/watch?v=nJE9-TjYArs) - - Album: [Metropolis Pt 2: Scenes From a Memory](https://www.youtube.com/watch?v=H2UHWFU5uFY&list=OLAK5uy_mY0UJ7SdDG7n4DgXGJ_h-vG0QH9LpayaA) - - This is an album to listen from start to end, in order, all songs are awesome. Each song is connected to the following, and the whole album tells a story. + - [Endless Sacrifice](https://www.youtube.com/watch?v=P9Lnan8t0v8) + - [As I Am](https://www.youtube.com/watch?v=_Q9Ss5zZU4k) + - [The Killing Hand](https://www.youtube.com/watch?v=W30yH0IdQlI) - [Liquid Tension Experiment](https://en.wikipedia.org/wiki/Liquid_Tension_Experiment) - One cannot mention Dream Theater without mentioning Liquid Tension Experiment. - [Acid Rain](https://www.youtube.com/watch?v=YLQnSULW2zI) @@ -262,6 +292,7 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. - *In the sky, a mighty eagle doesn't care about what's illegal*. - Is Helloween a libertarian band? - [Dr. Stein](https://www.youtube.com/watch?v=F6s7HYM0Urs) + - Cover: [Electric Eye](https://www.youtube.com/watch?v=sFqAiiRtySc) - [Rush](https://en.wikipedia.org/wiki/Rush_(band)) - To be honest, I have conflicting feelings with Geddy Lee's voice. But I like their music. - In the movie [I Love You, Man](https://en.wikipedia.org/wiki/I_Love_You%2C_Man), Paul Rudd and Jason Segel play Tom Sawyer, and then attend a Rush concert. @@ -292,6 +323,8 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. - Heavy Metal version of [Jingle Bell](https://en.wikipedia.org/wiki/Jingle_Bells). Is this heresy? I love it. - [Charlemagne: By the Sword and the Cross](https://www.youtube.com/watch?v=ro1nk8ZKi0I&list=OLAK5uy_nC0iYfFZUZnWhECaOiGe-ivn3gJwYZSbM) - [Charlemagne: The Omens of Death](https://www.youtube.com/watch?v=FOq7GPM74NM&list=OLAK5uy_ntyC2lrns6GSbZvEgsFX7Yycb2PIDeDfI) +- [Symphony X](https://en.wikipedia.org/wiki/Symphony_X) + - [Smoke and Mirros](https://www.youtube.com/watch?v=i4p_PO8_OnY) - [Coroner](https://en.wikipedia.org/wiki/Coroner_(band)) - No so famous band. I found them on the [Rate Your Music](https://rateyourmusic.com/) website. - [W.A.S.P.](https://en.wikipedia.org/wiki/W.A.S.P._(band)) @@ -308,25 +341,43 @@ Ricardo Iorio, Claudio O'Connor, Charly García, Luis Alberto Spinetta. ### Argentinian Heavy Metal +- [Ricardo Iorio](https://en.wikipedia.org/wiki/Ricardo_Iorio) + - He would be the father of argentine Heavy Metal. He founded V8, then Herética, then Almafuerte, and then he played as a solo artist. + - His style, in particular with Almafuerte, was kind of folk heavy metal. Using ideas from argentinie folk music and tango. + - His lyrics are very good (since Hermética). + - Cover: [Mariposas de Madera](https://www.youtube.com/watch?v=InX7BkghMTk) (Miguel Abuelo) - [Hermética](https://en.wikipedia.org/wiki/Herm%C3%A9tica) - This is the best band from Argentina, ever. Only 3 albums and the 3 of them are good. - [Memoria de Siglos](https://www.youtube.com/watch?v=Blk8ZqxTzbo) + - *Many wear the Phrygian cap only because they are bald* - [Gil Trabajador](https://www.youtube.com/watch?v=9-q5Nz1ADjk) - [Desde el Oeste](https://www.youtube.com/watch?v=TKny97TvxRg) + - [En las Calles de Liniers](https://www.youtube.com/watch?v=QDhWPz5aYAE) + - [Soy de la Esquina](https://www.youtube.com/watch?v=G__R8-FyWvY) + - [Vida Impersonal](https://www.youtube.com/watch?v=hEwKj-QVbWA) + - [Atravesando Todo Límite](https://www.youtube.com/watch?v=WlI7QuIq2tY) + - I was told this song was about the disappearance of Iorio's brother-in-law or father-in-law. + - [Ayer Deseo, Hoy Realidad](https://www.youtube.com/watch?v=SNuHsu67GmI) + - [Moraleja](https://www.youtube.com/watch?v=rPV27S_kuvc) - Cover: [Cambalache](https://www.youtube.com/watch?v=mRo0M_fq3Ho) (Enrique Santos Discépolo) + - Cover: [Evitando el Ablande - Aonikenk](https://www.youtube.com/watch?v=m6WC3n-pxU8) + - Album: [Hermética](https://www.youtube.com/watch?v=z9llA2nCGow&list=OLAK5uy_l7Ya56pbMfKvcwWWMI5IciPiaBKb5VfQw) + - Album: [Ácido Argentino](https://www.youtube.com/watch?v=POhDm4wcQFo&list=OLAK5uy_krjPZvCo3YEuRIXdvEY1Q6UwayZko0by8) + - Album: [Víctimas del Vaciamiento](https://www.youtube.com/watch?v=G__R8-FyWvY&list=OLAK5uy_n9UZzbHnSW0od6be-_M0buYuMctfLr_mo) - [Almafuerte](https://en.wikipedia.org/wiki/Almafuerte_(band)) + - Live: [Popurrí](https://www.youtube.com/watch?v=yL69XXgKuMI) + - This is a medley (aka **popurrí**) of songs that Iorio composed when he was younger (as he said just before starting this medley). - [Se Vos](https://www.youtube.com/watch?v=_0DQZLsUc8c) - *Be yourself and nothing more, even when others make it hard.* -- [Ricardo Iorio](https://en.wikipedia.org/wiki/Ricardo_Iorio) - - He would be the father of argentine Heavy Metal. He founded V8, then Herética, then Almafuerte, and then he played as a solo artist. - - His style, in particular with Almafuerte, was kind of folk heavy metal. Using ideas from argentinie folk music and tango. - - His lyrics are very good (since Hermética). - - Cover: [Mariposas de Madera](https://www.youtube.com/watch?v=InX7BkghMTk) (Miguel Abuelo) - [V8](https://en.wikipedia.org/wiki/V8_(band)) - I think V8 is important because of history, but I strongly prefer Almafuerte, or even better, Hermémtica. - [Brigadas Metálicas](https://www.youtube.com/watch?v=hKv4dGKBPJs) - [Destrucción](https://www.youtube.com/watch?v=jcvu8FzFh3M) - [Muy Cansado Estoy](https://www.youtube.com/watch?v=84XIv2pR1SU) +- [Aonikenk](https://www.metal-archives.com/bands/Aonikenk/8481) + - The [Aonikenk](https://en.wikipedia.org/wiki/Tehuelche_people) are an indigenous people from the eastern patagonia. They are also known as Tehuelche. + - [A mi Argentina](https://www.youtube.com/watch?v=P4OvVsRNXRY) + - Cover: [Evitando el Ablande](https://www.youtube.com/watch?v=m6WC3n-pxU8) - [Rata Blanca](https://en.wikipedia.org/wiki/Rata_Blanca) - The guitarrist, Walter Giardino, was in V8 for a few months. In the song [Buscando Razón](https://www.youtube.com/watch?v=iO8GvjEZbN0) by Hermética, the lyrics is about V8 rejecting Walter because he wrote "love ballads". diff --git a/zola/content/blog/tor-at-home-experience.md b/zola/content/blog/tor-at-home-experience.md new file mode 100644 index 0000000..ea02e98 --- /dev/null +++ b/zola/content/blog/tor-at-home-experience.md @@ -0,0 +1,44 @@ ++++ +title = "A Tor middle relay at home, and the ignorance from the \"Cybersecurity\" team" +description = "I was running a Tor middle relay at home, and I received a call from the \"Cybersecurity\" department from a client. They didn't know much about Tor." +date = 2025-06-10 +authors = ["Nicolás Dato"] + +[taxonomies] +Tags=["Tor"] ++++ + +## Background + +Some years ago I decided to contribute to the Tor network by running a Tor middle relay. I decided to run it at home, in my personal computer. I knew there could be some negative consequences like some websites blocking me, or an increment in captchas I had to solve. + +That personal computer is the same I use to work, and we have a client that is a big corpo. From time to time we provide technical support by connecting to their VPN. I hadn't connect to their VPN for a long time. + +When someone uses Tor, they use 3 relays in order: the guard, the middle, and the exit relay. If someone sees a connection from an IP that is an exit relay, it can be a Tor connection. *If someone sees a connection from a middle relay IP, it CAN'T be a Tor connection* because Tor doesn't work like that, the middle relay connects to the exit relay and it's the exit node that connects to the destination. + +## The call from the big corpo + +One day they changed their VPN and I had a call with them to configure the new VPN, set up the account and so on. Of course, as this is a big corpo they use proprietary software, I always try to use a free software alternative if it works, but as I was in a phone call with them I decided to boot Windows and install that proprietary VPN. I followed all instructions, successfully connected to their VPN, disconnected, and ended the phone call. + +Minutes latter I received a phone call from an unknown number. I didn't answer but they called again so I answered. They asked me if I was me (yes) and they said they where from the cybersecurity team from that big corpo. They started asking me weird questions about which software I was using to connect to their VPN. That was a big surprise because I would expect those questions if I had used an unofficial free software from Linux, but in this case I did use Windows and the official proprietary software. I told them that I was in a phone call with them and they guided me on how to connect to the VPN and I that followed all the steps, but they kept asking about me how I connected to their VPN. I think they were hiding the real question, maybe they first wanted to gather information from me, because after some time *they finally asked if I was using Tor* (or something like that). + +At first, I was kind of excited. *It was my moment to talk about Tor*. I thought it would be easy to explain, as they were the cybersecurity team they should know even more than me about Tor. So I would just say I run the middle relay, maybe explain a bit about Tor just in case, and they would be happy and I would be happy too because I could talk about Tor to someone else. + +The reality was that *they knew nothing about Tor*, only that it was a privacy software. I tried to explain them how the guard-middle-exit relays works, and that I run a middle relay but I wasn't using the Tor network, and that I was on Windows so there wasn't any relay running at that time. But I couldn't explain myself, or they didn't want to take me explanation. They didn't understand that if they were seeing my IP it meant that I wasn't using Tor because I was a middle relay, if I had been using Tor they would have seen the IP of an exit relay. + +Eventually they decided to consult with their manager and that they would call me back. I checked that I hadn't run an exit relay by mistake (I wasn't), and I tried to convince myself, to prove myself, that I wasn't connecting through Tor (I wasn't). + +Finally, they contacted me by email and *they demanded me to stop using Tor to connect to their VPN*. In the email there was an screenshot showing a log with my IP and some information. I searched that line and I found literally the same line on a website that lists all the Tor relays. One of the columns was the type of relay and my IP was a middle relay, as it should be. + +I didn't like that email, it meant they didn't know anything about Tor, and they accused me of doing something that I didn't do, and demanded me to stop doing that thing that I wasn't doing. I was thinking in sending an email telling them that I didn't use Tor and writing an explanation with links to Tor's website. But I decided the best was to follow they commands, i.e. do nothing. I told them "I won't use Tor to connect to their VPN", which was what they wanted to read from me, and somehow I was satisfied because I wasn't lying nor saying that I did use Tor. + +Anyway, I decided to stop running the Tor middle relay at home in case I needed to connect to their VPN (but I never had to connect to their VPN ever again). I knew that having it at home wasn't good for the network because I was rebooting the computer or powering it off constantly. After that I set up a VPS (this website) [that runs a Tor relay](https://metrics.torproject.org/rs.html#details/7EAAA9A9A1B0B834B74C60CDBBCE306CA7F91423). + +## Thoughts about the Cybersecurity team and their demands + +At that time, when I received the phone call and then the email, I thought they were idiots, ignorants, that were in a position (cybersecurity) that they didn't deserve, and that they were saying and demanding nonsenses. + +Now I understand that they have protocols and software with alarms, and that they have to comply with that. If the software says that there was a suspicious connection, and the protocol is to stop it, I get it, no matter what I could tell them, they didn't like my connection and I should stop doing whatever I was doing. + +However, I still think they were (are) ignorants and idiots, I think they should have said something like "ok, I understand that you run a middle relay and in fact the log says so. I understand that you didn't connect through the Tor network. But you know that as we've got an alarm here we can't let it go, and if you connect again the alarm will show up again. Can you stop the tor middle relay if you are going to connect to our VPN?". + diff --git a/zola/templates/page.html b/zola/templates/page.html index bad9764..231be36 100644 --- a/zola/templates/page.html +++ b/zola/templates/page.html @@ -11,9 +11,9 @@ {% endblock %} {% block content %} <article title="{{ page.title }}"> - {{ page.description }}<br/> - Created: <em>{{ page.date }}</em> - {% if page.updated %} <br/>Updated: <em>{{ page.updated }}</em> {% endif %} + <em>Created:</em> {{ page.date }}<br/> + {% if page.updated %}<em>Updated:</em> {{ page.updated }}<br/> {% endif %} + <br/><em>Description:</em> {{ page.description }}<br/> {{ page.content | safe }} </article> {% endblock %} diff --git a/zola/templates/section.html b/zola/templates/section.html index fd31fba..a618d5f 100644 --- a/zola/templates/section.html +++ b/zola/templates/section.html @@ -16,10 +16,10 @@ <p><a href="{{ page.path | safe}}">{{ page.title }}</a></p> </dt> <dd> - <p>{{ page.description }}<p> - <p>Created: <em><date datetime="{{ page.date }}">{{ page.date }}</date></em> + <p><em>Description:</em> {{ page.description }}<p> + <p><em>Created:</em> <date datetime="{{ page.date }}">{{ page.date }}</date> {% if page.updated %} - <br/>Updated: <em><date datetime="{{ page.updated }}">{{ page.updated }}</date></em> + <br/><em>Updated:</em> <date datetime="{{ page.updated }}">{{ page.updated }}</date> {% endif %} </p> {% for kind, values in page.taxonomies %} |