Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/237d33bcb3d0dfacc4e2bc75ba3ea54665196c9f
...commit 
http://git.netsurf-browser.org/netsurf-wiki.git/commit/237d33bcb3d0dfacc4e2bc75ba3ea54665196c9f
...tree 
http://git.netsurf-browser.org/netsurf-wiki.git/tree/237d33bcb3d0dfacc4e2bc75ba3ea54665196c9f

The branch, master has been updated
       via  237d33bcb3d0dfacc4e2bc75ba3ea54665196c9f (commit)
      from  0238cbcfc0b5ca59e0ee7105db657cc2b866ba10 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=237d33bcb3d0dfacc4e2bc75ba3ea54665196c9f
commit 237d33bcb3d0dfacc4e2bc75ba3ea54665196c9f
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>

    fix fedora CI instructions formatting

diff --git a/continuous_integration/fedora_25_setup.mdwn 
b/continuous_integration/fedora_25_setup.mdwn
index cce96ac..39bc2b0 100644
--- a/continuous_integration/fedora_25_setup.mdwn
+++ b/continuous_integration/fedora_25_setup.mdwn
@@ -21,7 +21,7 @@ Run through the base install steps ensuring to create the 
netsurf user.
 
 to obtain required packages
 
-    dnf install fedora-packager fedora-review java-1.8.0-openjdk-headless gcc 
clang git pkgconfig libcurl-devel libjpeg-devel bison flex expat-devel 
libpng-devel openssl-devel screen check gperf perl-HTML-Parser ccache
+    dnf install fedora-packager fedora-review java-1.8.0-openjdk-headless gcc 
clang git pkgconfig libcurl-devel libjpeg-devel bison flex expat-devel 
libpng-devel openssl-devel check gperf perl-HTML-Parser ccache
 
 For gtk2 builds
 
@@ -53,7 +53,7 @@ ensure /opt is setup correctly to allow toolchains to be 
built on the node
 
 become jenkins user
 
-    su -s/bin/bash - jenkins
+    su -s /bin/bash - jenkins
 
 create ssh keypair (accept defaults - no password)
 
@@ -90,7 +90,7 @@ create ns-ci-worker.service file
 
 untill [this bug](https://bugzilla.redhat.com/show_bug.cgi?id=1358476) is 
resolved it is necessary to symlink the jli library object somewhere the rpath 
faliure does not affect.
 
-   # ln -s 
/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-1.b12.fc25.x86_64/jre/lib/amd64/jli/libjli.so
 /usr/lib64/libjli.so
+    # ln -s 
/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-1.b12.fc25.x86_64/jre/lib/amd64/jli/libjli.so
 /usr/lib64/libjli.so
 
 install and start new service
 
diff --git a/virtual_host_server.mdwn b/virtual_host_server.mdwn
index 1d66542..93fcab5 100644
--- a/virtual_host_server.mdwn
+++ b/virtual_host_server.mdwn
@@ -6,38 +6,34 @@
 [[!toc]] The system providing the
 virtual host services for the NetSurf project is currently named phoenix.
 
-Access is \*only\* via the NetSurf VPN. For VPN access contact 
[email protected]
-Developers can also use their ssh key access to ci.netsurf-browser.org and on 
from there
+Access is \*only\* via the NetSurf VPN. For VPN access contact 
[email protected] Developers can also use their ssh key access to 
ci.netsurf-browser.org and on from there
 
-phoenix is currently 192.168.211.50 if the DNS is unavailable
+phoenix IP address is currently 192.168.211.50 if the DNS is unavailable
 
 Creating a new VPS
 ------------------
 
 Become superuser with sudo
 
-### Debian VPS
+### Debian
 
-If you are creating a new Debian box there is a helper script
-(new-stretch-vps.sh ) which just just need to pass a system name to and
-you will get a 40G disc/ 512MB RAM system.
+If you are creating a new Debian box there is a helper script 
(new-stretch-vps.sh ) which just just need to pass a system name to and you 
will get a 40G disc/ 512MB RAM system.
 
 for example:
 
-`new-stretch-vps.sh ciworker18`
+    new-stretch-vps.sh ciworker18
 
-will create a system named ciworker18 with 40G of disc and 512MB of
-memory with the Debian stretch boot iso connected to the cdrom drive.
+will create a system named ciworker18 with 40G of disc and 512MB of memory 
with the Debian stretch boot iso connected to the cdrom drive.
 
 ### Fedora
 
--   create lvm device for the system
+create lvm device for the system
 
-    lvcreate --size 40G -n nsciworker18 vg
+    lvcreate --size 40G -n nsciworker18 vg
 
--   Ensure the OS install dvd is in /var/lib/libvirt/images/
+Ensure the OS install dvd is in /var/lib/libvirt/images/
 
--   Create the virtual machine
+Create the virtual machine
 
     virt-install -n nsciworker18 -r 1024 \
     --disk path=/dev/mapper/vg-${VDSNAME},bus=virtio \
@@ -50,33 +46,32 @@ memory with the Debian stretch boot iso connected to the 
cdrom drive.
     --location /var/lib/libvirt/images/Fedora-Server-dvd-x86_64-25-1.3.iso \
     --extra-args='console=tty0 console=ttyS0,115200n8 serial'
 
--   Once running the serial console can be used
+Once running the serial console can be used
 
     virsh console nsciworker18
 
 
-### Other VPS
+### Other
 
 The manual setup for other systems is:
 
--   create lvm device for the system
+create lvm device for the system
 
-    lvcreate --size 40G -n system_name vg
+    lvcreate --size 40G -n system_name vg
 
--   if the OS requires a cdrom install media download and place in
-    /var/lib/libvirt/images/
+if the OS requires a cdrom install media download and place in 
/var/lib/libvirt/images/
 
--   use virt install to create the new VM substitutig appropriate values
-    for volume name, memory, boot disc
+use virt install to create the new VM substitutig appropriate values for 
volume name, memory, boot disc
 
-    virt-install -n ciworker13 -r 512 --disk 
path=/dev/mapper/vg-ciworker13,bus=virtio \  
-    -c /var/lib/libvirt/images/cd54.iso --accelerate --network=bridge:br0 \
-    --connect=qemu:///system --vnc --noautoconsole -v
+    virt-install -n ciworker18 -r 512 \
+    --disk path=/dev/mapper/vg-ciworker13,bus=virtio \  
+    -c /var/lib/libvirt/images/cd54.iso \
+    --accelerate --network=bridge:br0 \
+    --connect=qemu:///system \
+    --vnc --noautoconsole -v
 
 Admin
 -----
 
-You can either use virsh on phoenix to directly admin consoles or
-alternatively use virt-admin over the VPN which is by far the easier
-option.
+You can either use virsh on phoenix to directly admin consoles or 
alternatively use virt-admin over the VPN which is by far the easier option.
 


-----------------------------------------------------------------------

Summary of changes:
 continuous_integration/fedora_25_setup.mdwn |    6 ++--
 virtual_host_server.mdwn                    |   51 ++++++++++++---------------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/continuous_integration/fedora_25_setup.mdwn 
b/continuous_integration/fedora_25_setup.mdwn
index cce96ac..39bc2b0 100644
--- a/continuous_integration/fedora_25_setup.mdwn
+++ b/continuous_integration/fedora_25_setup.mdwn
@@ -21,7 +21,7 @@ Run through the base install steps ensuring to create the 
netsurf user.
 
 to obtain required packages
 
-    dnf install fedora-packager fedora-review java-1.8.0-openjdk-headless gcc 
clang git pkgconfig libcurl-devel libjpeg-devel bison flex expat-devel 
libpng-devel openssl-devel screen check gperf perl-HTML-Parser ccache
+    dnf install fedora-packager fedora-review java-1.8.0-openjdk-headless gcc 
clang git pkgconfig libcurl-devel libjpeg-devel bison flex expat-devel 
libpng-devel openssl-devel check gperf perl-HTML-Parser ccache
 
 For gtk2 builds
 
@@ -53,7 +53,7 @@ ensure /opt is setup correctly to allow toolchains to be 
built on the node
 
 become jenkins user
 
-    su -s/bin/bash - jenkins
+    su -s /bin/bash - jenkins
 
 create ssh keypair (accept defaults - no password)
 
@@ -90,7 +90,7 @@ create ns-ci-worker.service file
 
 untill [this bug](https://bugzilla.redhat.com/show_bug.cgi?id=1358476) is 
resolved it is necessary to symlink the jli library object somewhere the rpath 
faliure does not affect.
 
-   # ln -s 
/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-1.b12.fc25.x86_64/jre/lib/amd64/jli/libjli.so
 /usr/lib64/libjli.so
+    # ln -s 
/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-1.b12.fc25.x86_64/jre/lib/amd64/jli/libjli.so
 /usr/lib64/libjli.so
 
 install and start new service
 
diff --git a/virtual_host_server.mdwn b/virtual_host_server.mdwn
index 1d66542..93fcab5 100644
--- a/virtual_host_server.mdwn
+++ b/virtual_host_server.mdwn
@@ -6,38 +6,34 @@
 [[!toc]] The system providing the
 virtual host services for the NetSurf project is currently named phoenix.
 
-Access is \*only\* via the NetSurf VPN. For VPN access contact 
[email protected]
-Developers can also use their ssh key access to ci.netsurf-browser.org and on 
from there
+Access is \*only\* via the NetSurf VPN. For VPN access contact 
[email protected] Developers can also use their ssh key access to 
ci.netsurf-browser.org and on from there
 
-phoenix is currently 192.168.211.50 if the DNS is unavailable
+phoenix IP address is currently 192.168.211.50 if the DNS is unavailable
 
 Creating a new VPS
 ------------------
 
 Become superuser with sudo
 
-### Debian VPS
+### Debian
 
-If you are creating a new Debian box there is a helper script
-(new-stretch-vps.sh ) which just just need to pass a system name to and
-you will get a 40G disc/ 512MB RAM system.
+If you are creating a new Debian box there is a helper script 
(new-stretch-vps.sh ) which just just need to pass a system name to and you 
will get a 40G disc/ 512MB RAM system.
 
 for example:
 
-`new-stretch-vps.sh ciworker18`
+    new-stretch-vps.sh ciworker18
 
-will create a system named ciworker18 with 40G of disc and 512MB of
-memory with the Debian stretch boot iso connected to the cdrom drive.
+will create a system named ciworker18 with 40G of disc and 512MB of memory 
with the Debian stretch boot iso connected to the cdrom drive.
 
 ### Fedora
 
--   create lvm device for the system
+create lvm device for the system
 
-    lvcreate --size 40G -n nsciworker18 vg
+    lvcreate --size 40G -n nsciworker18 vg
 
--   Ensure the OS install dvd is in /var/lib/libvirt/images/
+Ensure the OS install dvd is in /var/lib/libvirt/images/
 
--   Create the virtual machine
+Create the virtual machine
 
     virt-install -n nsciworker18 -r 1024 \
     --disk path=/dev/mapper/vg-${VDSNAME},bus=virtio \
@@ -50,33 +46,32 @@ memory with the Debian stretch boot iso connected to the 
cdrom drive.
     --location /var/lib/libvirt/images/Fedora-Server-dvd-x86_64-25-1.3.iso \
     --extra-args='console=tty0 console=ttyS0,115200n8 serial'
 
--   Once running the serial console can be used
+Once running the serial console can be used
 
     virsh console nsciworker18
 
 
-### Other VPS
+### Other
 
 The manual setup for other systems is:
 
--   create lvm device for the system
+create lvm device for the system
 
-    lvcreate --size 40G -n system_name vg
+    lvcreate --size 40G -n system_name vg
 
--   if the OS requires a cdrom install media download and place in
-    /var/lib/libvirt/images/
+if the OS requires a cdrom install media download and place in 
/var/lib/libvirt/images/
 
--   use virt install to create the new VM substitutig appropriate values
-    for volume name, memory, boot disc
+use virt install to create the new VM substitutig appropriate values for 
volume name, memory, boot disc
 
-    virt-install -n ciworker13 -r 512 --disk 
path=/dev/mapper/vg-ciworker13,bus=virtio \  
-    -c /var/lib/libvirt/images/cd54.iso --accelerate --network=bridge:br0 \
-    --connect=qemu:///system --vnc --noautoconsole -v
+    virt-install -n ciworker18 -r 512 \
+    --disk path=/dev/mapper/vg-ciworker13,bus=virtio \  
+    -c /var/lib/libvirt/images/cd54.iso \
+    --accelerate --network=bridge:br0 \
+    --connect=qemu:///system \
+    --vnc --noautoconsole -v
 
 Admin
 -----
 
-You can either use virsh on phoenix to directly admin consoles or
-alternatively use virt-admin over the VPN which is by far the easier
-option.
+You can either use virsh on phoenix to directly admin consoles or 
alternatively use virt-admin over the VPN which is by far the easier option.
 


-- 
NetSurf Developer Wiki Backing Store

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to