free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram 7 years ago
parent
b9050b9b2f c8ee6129d0
commit
3aacf66e30
3 changed files with 52 additions and 32 deletions
Unified View Show Diff Stats
  1. 2
    0
      doc/EN/support.org
  2. 14
    4
      src/freedombone-app-ghost
  3. 36
    28
      website/EN/support.html

+ 2
- 0
doc/EN/support.org View File

45 
 ** Web design and artwork
 45 
 ** Web design and artwork
46 
 A better design for this website would be nice to have. Photos, icons or other artwork are all welcome. I've always liked the cartoon artwork of the [[https://www.mediagoblin.org/][Mediagoblin]] project, and attractive graphics can help to get people initially interested.
 46 
 A better design for this website would be nice to have. Photos, icons or other artwork are all welcome. I've always liked the cartoon artwork of the [[https://www.mediagoblin.org/][Mediagoblin]] project, and attractive graphics can help to get people initially interested.
47
47
48 
+** Howto videos
49 
+If you're good at making videos then a howto for installing Freedombone onto various types of hardware, or testing the mesh system in realistic/exotic scenarios would be good. You could even host videos on PeerTube or Mediagoblin.
48 
 ** More education and promotion
 50 
 ** More education and promotion
49 
 #+BEGIN_CENTER
 51 
 #+BEGIN_CENTER
50 
 [[./images/educate.png]]
 52 
 [[./images/educate.png]]

+ 14
- 4
src/freedombone-app-ghost View File

84
84
85 
 function ghost_rss_button {
 85 
 function ghost_rss_button {
86 
     # remove feedly -aaargh!
 86 
     # remove feedly -aaargh!
87 
-    sed -i 's|http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/|{{@blog.url}}/rss/|g' /var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/themes/casper/partials/site-nav.hbs
88 
-    sed -i 's|http://cloud.feedly.com/#subscription/feed/{{url absolute="true"}}/rss/|{{url absolute="true"}}rss/|g' /var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/themes/casper/author.hbs
87 
+    sed -i 's|http://cloud.feedly.com/#subscription/feed/{{@blog.url}}/rss/|{{@blog.url}}/rss/|g' /var/www/$GHOST_DOMAIN_NAME/htdocs/versions/${GHOST_VERSION}/content/themes/casper/partials/site-nav.hbs
88 
+    sed -i 's|http://cloud.feedly.com/#subscription/feed/{{url absolute="true"}}/rss/|{{url absolute="true"}}rss/|g' /var/www/$GHOST_DOMAIN_NAME/htdocs/versions/${GHOST_VERSION}/content/themes/casper/author.hbs
89 
+
89 
 }
 90 
 }
90
91
91 
 function ghost_remove_offsite_links {
 92 
 function ghost_remove_offsite_links {
464
465
465 
     ghost_bust
 466 
     ghost_bust
466
467
467 
-    # NOTE: this has to be http, not https
468 
-    sed -i "s|\"url\":|\"url\": \"http://${GHOST_DOMAIN_NAME}/\",|g" /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json
468 
+    echo '{' > /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json
469 
+    if [[ "$ONION_ONLY" == 'no' ]]; then
470 
+        # NOTE: url must be http, not https
471 
+        echo "  \"url\": \"http://${GHOST_DOMAIN_NAME}\"," >> /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json
472 
+    else
473 
+        echo "  \"url\": \"http://${GHOST_ONION_HOSTNAME}\"," >> /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json
474 
+    fi
475 
+    echo '    "paths": {' >> /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json
476 
+    echo "        \"contentPath\": \"/var/www/${GHOST_DOMAIN_NAME}/htdocs/content\"" >> /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json
477 
+    echo '    }' >> /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json
478 
+    echo '}' >> /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json
469
479
470 
     echo '[Unit]' > /etc/systemd/system/ghost.service
 480 
     echo '[Unit]' > /etc/systemd/system/ghost.service
471 
     echo 'Description=Ghost Blog' >> /etc/systemd/system/ghost.service
 481 
     echo 'Description=Ghost Blog' >> /etc/systemd/system/ghost.service

+ 36
- 28
website/EN/support.html View File

3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 
 <head>
 5 
 <head>
6 
-<!-- 2018-02-04 Sun 21:06 -->
6 
+<!-- 2018-02-04 Sun 21:22 -->
7 
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 7 
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 8 
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 
 <title>&lrm;</title>
 9 
 <title>&lrm;</title>
248 
 <h1>Support</h1>
 248 
 <h1>Support</h1>
249 
 </center>
 249 
 </center>
250
250
251 
-<div id="outline-container-org0e0937c" class="outline-2">
252 
-<h2 id="org0e0937c">Contact details</h2>
253 
-<div class="outline-text-2" id="text-org0e0937c">
251 
+<div id="outline-container-orgbc8f3ea" class="outline-2">
252 
+<h2 id="orgbc8f3ea">Contact details</h2>
253 
+<div class="outline-text-2" id="text-orgbc8f3ea">
254 
 <p>
 254 
 <p>
255 
 This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion">http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion</a></b>
 255 
 This site can also be accessed via a Tor browser at <b><a href="http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion">http://yjxlc3imv7obva4grjae6u3qw527koaytrgjgdp364hmthrst3jodiid.onion</a></b>
256 
 </p>
 256 
 </p>
277 
 </div>
 277 
 </div>
278 
 </div>
 278 
 </div>
279
279
280 
-<div id="outline-container-orgf895e81" class="outline-2">
281 
-<h2 id="orgf895e81">Things which would be nice to have</h2>
282 
-<div class="outline-text-2" id="text-orgf895e81">
280 
+<div id="outline-container-org742c05a" class="outline-2">
281 
+<h2 id="org742c05a">Things which would be nice to have</h2>
282 
+<div class="outline-text-2" id="text-org742c05a">
283 
 </div>
 283 
 </div>
284 
-<div id="outline-container-orge5cd1e4" class="outline-3">
285 
-<h3 id="orge5cd1e4">Ideas</h3>
286 
-<div class="outline-text-3" id="text-orge5cd1e4">
284 
+<div id="outline-container-org317c742" class="outline-3">
285 
+<h3 id="org317c742">Ideas</h3>
286 
+<div class="outline-text-3" id="text-org317c742">
287 
 <p>
 287 
 <p>
288 
 Know of some fabulous web system which could run on Freedombone, but currently doesn't? Contact the above, and be prepared to make a compelling argument for why it should be included.
 288 
 Know of some fabulous web system which could run on Freedombone, but currently doesn't? Contact the above, and be prepared to make a compelling argument for why it should be included.
289 
 </p>
 289 
 </p>
290 
 </div>
 290 
 </div>
291 
 </div>
 291 
 </div>
292
292
293 
-<div id="outline-container-orgb9b2919" class="outline-3">
294 
-<h3 id="orgb9b2919">Money</h3>
295 
-<div class="outline-text-3" id="text-orgb9b2919">
293 
+<div id="outline-container-orgafbb438" class="outline-3">
294 
+<h3 id="orgafbb438">Money</h3>
295 
+<div class="outline-text-3" id="text-orgafbb438">
296 
 <p>
 296 
 <p>
297 
 At the present time this project is not seeking any funding. There is no crowdfunding campaign and no slick marketing video. Those aren't ruled out as future possibilities, but for now they're just not needed.
 297 
 At the present time this project is not seeking any funding. There is no crowdfunding campaign and no slick marketing video. Those aren't ruled out as future possibilities, but for now they're just not needed.
298 
 </p>
 298 
 </p>
303 
 </div>
 303 
 </div>
304 
 </div>
 304 
 </div>
305
305
306 
-<div id="outline-container-org08545d9" class="outline-3">
307 
-<h3 id="org08545d9">Testing and reporting bugs</h3>
308 
-<div class="outline-text-3" id="text-org08545d9">
306 
+<div id="outline-container-org2edf966" class="outline-3">
307 
+<h3 id="org2edf966">Testing and reporting bugs</h3>
308 
+<div class="outline-text-3" id="text-org2edf966">
309 
 <p>
 309 
 <p>
310 
 Testing of the install on different hardware. Also pentesting on test installations to find vulnerabilities.
 310 
 Testing of the install on different hardware. Also pentesting on test installations to find vulnerabilities.
311 
 </p>
 311 
 </p>
312 
 </div>
 312 
 </div>
313 
 </div>
 313 
 </div>
314
314
315 
-<div id="outline-container-org06ca887" class="outline-3">
316 
-<h3 id="org06ca887">Web design and artwork</h3>
317 
-<div class="outline-text-3" id="text-org06ca887">
315 
+<div id="outline-container-org10bcaa2" class="outline-3">
316 
+<h3 id="org10bcaa2">Web design and artwork</h3>
317 
+<div class="outline-text-3" id="text-org10bcaa2">
318 
 <p>
 318 
 <p>
319 
 A better design for this website would be nice to have. Photos, icons or other artwork are all welcome. I've always liked the cartoon artwork of the <a href="https://www.mediagoblin.org/">Mediagoblin</a> project, and attractive graphics can help to get people initially interested.
 319 
 A better design for this website would be nice to have. Photos, icons or other artwork are all welcome. I've always liked the cartoon artwork of the <a href="https://www.mediagoblin.org/">Mediagoblin</a> project, and attractive graphics can help to get people initially interested.
320 
 </p>
 320 
 </p>
321 
 </div>
 321 
 </div>
322 
 </div>
 322 
 </div>
323
323
324 
-<div id="outline-container-orgc33f01d" class="outline-3">
325 
-<h3 id="orgc33f01d">More education and promotion</h3>
326 
-<div class="outline-text-3" id="text-orgc33f01d">
324 
+<div id="outline-container-org881c8f8" class="outline-3">
325 
+<h3 id="org881c8f8">Howto videos</h3>
326 
+<div class="outline-text-3" id="text-org881c8f8">
327 
+<p>
328 
+If you're good at making videos then a howto for installing Freedombone onto various types of hardware, or testing the mesh system in realistic/exotic scenarios would be good. You could even host videos on PeerTube or Mediagoblin.
329 
+</p>
330 
+</div>
331 
+</div>
332 
+<div id="outline-container-org237516c" class="outline-3">
333 
+<h3 id="org237516c">More education and promotion</h3>
334 
+<div class="outline-text-3" id="text-org237516c">
327 
 <div class="org-center">
 335 
 <div class="org-center">
328
336
329 
 <div class="figure">
 337 
 <div class="figure">
341 
 </div>
 349 
 </div>
342 
 </div>
 350 
 </div>
343
351
344 
-<div id="outline-container-org447ca33" class="outline-3">
345 
-<h3 id="org447ca33">Translations</h3>
346 
-<div class="outline-text-3" id="text-org447ca33">
352 
+<div id="outline-container-org92766d9" class="outline-3">
353 
+<h3 id="org92766d9">Translations</h3>
354 
+<div class="outline-text-3" id="text-org92766d9">
347 
 <p>
 355 
 <p>
348 
 To add translations modify the json files within the <b>locale</b> subdirectory. Then make a pull request on the <a href="https://github.com/bashrc/freedombone">Github site</a>.
 356 
 To add translations modify the json files within the <b>locale</b> subdirectory. Then make a pull request on the <a href="https://github.com/bashrc/freedombone">Github site</a>.
349 
 </p>
 357 
 </p>
350 
 </div>
 358 
 </div>
351 
 </div>
 359 
 </div>
352
360
353 
-<div id="outline-container-orgd789c28" class="outline-3">
354 
-<h3 id="orgd789c28">Packaging</h3>
355 
-<div class="outline-text-3" id="text-orgd789c28">
361 
+<div id="outline-container-orgaf00625" class="outline-3">
362 
+<h3 id="orgaf00625">Packaging</h3>
363 
+<div class="outline-text-3" id="text-orgaf00625">
356 
 <p>
 364 
 <p>
357 
 Helping to package GNU Social and Hubzilla for Debian would be beneficial.
 365 
 Helping to package GNU Social and Hubzilla for Debian would be beneficial.
358 
 </p>
 366 
 </p>