From 7a6d444219ba6b3a42fece459414cc715db0a339 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sun, 22 May 2016 02:39:20 +0200 Subject: Change link formats from [[link|url]] to [link](url). --- create-a-wiki.mdwn | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'create-a-wiki.mdwn') diff --git a/create-a-wiki.mdwn b/create-a-wiki.mdwn index 37a944f..2965182 100644 --- a/create-a-wiki.mdwn +++ b/create-a-wiki.mdwn @@ -24,14 +24,14 @@ except requests from Internet. # Install and configure Git I can not recall how this was done. Refer to -[[Git's official website|https://git-scm.com/]] +[Git's official website](https://git-scm.com/) # Install and configure Ikiwiki -Refer to [[ikiwiki setup|https://ikiwiki.info/setup/]] at -[[ikiwiki's official website|https://ikiwiki.info]] for initial +Refer to [ikiwiki setup](https://ikiwiki.info/setup/) at +[ikiwiki's official website](https://ikiwiki.info) for initial install and configuration and -[[an article on Git|https://ikiwiki.info/rcs/git/]] for more details on +[an article on Git](https://ikiwiki.info/rcs/git/) for more details on setting up Ikiwiki together with Git. I did my best to answer the questions provided in the initial @@ -77,11 +77,11 @@ The connectivity chart is now as follows # Install and configure Apache 2 For installation, follow the instructions in -[[Apache's official documentation|https://httpd.apache.org/docs]]. I +[Apache's official documentation](https://httpd.apache.org/docs). I got Apache 2.4.6 installed. I needed to activate the userdir module. Refer to -[[Per-user web directories|https://httpd.apache.org/docs/2.4/howto/public_html.html]] +[Per-user web directories](https://httpd.apache.org/docs/2.4/howto/public_html.html) in Apache's documentation. For Debian do the following $ cd /etc/apache2/mods-enabled @@ -89,7 +89,7 @@ in Apache's documentation. For Debian do the following $ ln -s ln -s ../mods-available/userdir.conf Also CGI execution need to be activated. See -[[Dynamic Content with CGI|https://httpd.apache.org/docs/2.4/howto/cgi.html]] +[Dynamic Content with CGI](https://httpd.apache.org/docs/2.4/howto/cgi.html) in Apache's documentation. My _/etc/apache2/mods-available/userdir.conf_ now looks as follows @@ -130,7 +130,7 @@ But what if I want to inspect and verify my local changes before pushing them to _origin/master_? The subject is covered in -[[the article on Git|https://ikiwiki.info/rcs/git/]]. I did what +[the article on Git](https://ikiwiki.info/rcs/git/). I did what follows. Copy _wiki.setup_ to _wiki-preview.setup_ and edit those fields: -- cgit v1.2.3 From 1ebddb32516730542d5ee36da8c4a2db4d8c0e3a Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sun, 22 May 2016 05:41:25 +0200 Subject: Minor formatting fixes. --- create-a-wiki.mdwn | 78 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 35 deletions(-) (limited to 'create-a-wiki.mdwn') diff --git a/create-a-wiki.mdwn b/create-a-wiki.mdwn index 2965182..497de6b 100644 --- a/create-a-wiki.mdwn +++ b/create-a-wiki.mdwn @@ -6,27 +6,31 @@ with git. The components needed are -* Ikiwiki -* Apache2 or Nginx web server -* Git + * Ikiwiki + * Apache2 or Nginx web server + * Git **Table of Contents** [!toc] What I have in mind is to access my lab wiki through -_http://localhost/~/lab-wiki_ for web editing and -_~/lab-wiki/wiki-slave_ for local offline editing. +`http://localhost/~/lab-wiki` for web editing and +`~/lab-wiki/wiki-slave` for local offline editing. It should be noted that what is described here probably is a perfectly _unsafe_ usage of a web server. Make sure that the computer does not except requests from Internet. -# Install and configure Git + +Install and configure Git +========================= I can not recall how this was done. Refer to [Git's official website](https://git-scm.com/) -# Install and configure Ikiwiki + +Install and configure Ikiwiki +============================= Refer to [ikiwiki setup](https://ikiwiki.info/setup/) at [ikiwiki's official website](https://ikiwiki.info) for initial @@ -47,34 +51,36 @@ with something like this: However, not all of the above was configurable in the form, for example the configuration file location. I needed to move directories and files around and change the remaining configurations in -_~/lab-wiki/wiki.setup_ and run +`~/lab-wiki/wiki.setup` and run $ ikiwiki --setup ~/lab-wiki/wiki.setup -I also created the extra Git repository _wiki-slave_ for local edits: +I also created the extra Git repository `wiki-slave` for local edits: $ cd ~/lab-wiki; git clone wiki.git wiki-slave The connectivity chart is now as follows - . Bare Git Repository - . ~/lab-wiki/wiki.git - . / \ - . / \ - . / \ - . The Ikiwiki Repository | - . ~/lab-wiki/wiki | - . | | - . | Repository for Local Edits - . | ~/lab-wiki/wiki-slave - . | | - . The Ikiwiki Web Part | - . ~/public_html/lab-wiki | - . | - . The Preview Ikiwiki Web Part - . ~/public_html/lab-wiki-preview - -# Install and configure Apache 2 + Bare Git Repository + ~/lab-wiki/wiki.git + / \ + / \ + / \ + The Ikiwiki Repository | + ~/lab-wiki/wiki | + | | + | Repository for Local Edits + | ~/lab-wiki/wiki-slave + | | + The Ikiwiki Web Part | + ~/public_html/lab-wiki | + | + The Preview Ikiwiki Web Part + ~/public_html/lab-wiki-preview + + +Install and configure Apache 2 +============================== For installation, follow the instructions in [Apache's official documentation](https://httpd.apache.org/docs). I @@ -91,7 +97,7 @@ in Apache's documentation. For Debian do the following Also CGI execution need to be activated. See [Dynamic Content with CGI](https://httpd.apache.org/docs/2.4/howto/cgi.html) in Apache's documentation. My -_/etc/apache2/mods-available/userdir.conf_ now looks as follows +`/etc/apache2/mods-available/userdir.conf` now looks as follows UserDir public_html @@ -119,19 +125,21 @@ _/etc/apache2/mods-available/userdir.conf_ now looks as follows -# Get preview of local modifications + +Get preview of local modifications +================================== Now every thing works as work as expected. I can fetch the latest -updated to _wiki-slave_, perform my updates, and whenever those are -pushed to _origin/master_, the post-update hook makes sure that the +updated to `wiki-slave`, perform my updates, and whenever those are +pushed to `origin/master`, the post-update hook makes sure that the web version is updated. But what if I want to inspect and verify my local changes before -pushing them to _origin/master_? +pushing them to `origin/master`? The subject is covered in [the article on Git](https://ikiwiki.info/rcs/git/). I did what -follows. Copy _wiki.setup_ to _wiki-preview.setup_ and edit those +follows. Copy `wiki.setup` to `wiki-preview.setup` and edit those fields: wikiname: lab-wiki-preview @@ -150,5 +158,5 @@ is to, at any point, recompile/refresh the wiki: ikiwiki -setup ~/lab-wiki/wiki-preview.setup -refresh -Also, committing on the local _master_ branch _should_ automatically -update the lab-wiki-preview wiki. +Also, committing on the local `master` branch _should_ automatically +update the `lab-wiki-preview` wiki. -- cgit v1.2.3 From ab8e65c8b71ab879cf64c171887c0e5c265d6f23 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sun, 22 May 2016 05:52:22 +0200 Subject: Convert kalendarium page to Pandoc Markdown. --- create-a-wiki.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'create-a-wiki.mdwn') diff --git a/create-a-wiki.mdwn b/create-a-wiki.mdwn index 497de6b..1a741a4 100644 --- a/create-a-wiki.mdwn +++ b/create-a-wiki.mdwn @@ -11,7 +11,7 @@ The components needed are * Git **Table of Contents** -[!toc] +[[!toc]] What I have in mind is to access my lab wiki through `http://localhost/~/lab-wiki` for web editing and @@ -152,7 +152,7 @@ fields: gitorigin_branch: '' gitmaster_branch: master -The idea is that the preview wiki works against wiki-slave, which is +The idea is that the preview wiki works against `wiki-slave`, which is my simulated environment for local repository. What always works now is to, at any point, recompile/refresh the wiki: -- cgit v1.2.3 From 8c76d846f9c066e929d1ef28e527e48594cdc50b Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Sun, 15 Oct 2017 22:11:04 +0200 Subject: Create a wiki. Instructions for Nginx added Some instructions for Nginx added. Consider those a stub. *TODO Flash out those better.* --- create-a-wiki.mdwn | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'create-a-wiki.mdwn') diff --git a/create-a-wiki.mdwn b/create-a-wiki.mdwn index 1a741a4..b6736f1 100644 --- a/create-a-wiki.mdwn +++ b/create-a-wiki.mdwn @@ -38,6 +38,16 @@ install and configuration and [an article on Git](https://ikiwiki.info/rcs/git/) for more details on setting up Ikiwiki together with Git. +Install packages referred to in the ansible configuration: + + sudo aptitude install \ + ikiwiki \ + libauthen-passphrase-perl \ + highlight-common libhighlight-perl libimage-magick-perl \ + libmail-sendmail-perl libnet-dns-sec-perl \ + fcgiwrap spawn-fcgi \ + pandoc + I did my best to answer the questions provided in the initial installation and default configuration with the target of ending up with something like this: @@ -126,6 +136,21 @@ in Apache's documentation. My +Install and conifgure Nginx +=========================== + +A valid web server alternative +is +[Nginx](http://nginx.org/en/docs/). + +For installation and configuration +follow [Ikiwiki on Dot CGI](https://ikiwiki.info/tips/dot_cgi/). `sudo +aptitude install nginx`. Note the alexjj comment that on +Debian the package *fcgiwrap* automatically spwans the FastCGI +program. + + + Get preview of local modifications ================================== -- cgit v1.2.3