Merge pull request #408 from netbootxyz/development

Generate RC

.travis.yml

@@ -51,6 +51,8 @@ jobs:
             - githubout 
       after_failure:
         - ./script/message failure
+      before_deploy:
+        - export RELEASE_TAG=$(cat version.txt)-RC
       deploy:
         - provider: s3
           edge: true
@@ -107,6 +109,8 @@ jobs:
             - githubout 
       after_failure:
         - ./script/message failure
+      before_deploy:
+        - export RELEASE_TAG=$(cat version.txt)
       deploy:
         - provider: s3
           edge: true

CONTRIBUTING.md

@@ -49,5 +49,5 @@ idea, feel free to open up a Github [issue] or open up a [Pull Request].
 
 ## Enjoy and have fun!
 
-[issue]: https://github.com/antonym/netboot.xyz/issues/new
-[Pull Request]: https://github.com/antonym/netboot.xyz/pulls
+[issue]: https://github.com/netbootxyz/netboot.xyz/issues/new
+[Pull Request]: https://github.com/netbootxyz/netboot.xyz/pulls

Dockerfile-build

@@ -7,7 +7,7 @@ RUN \
 	ansible \
 	apache2  \
 	build-essential \
-        dosfstools \
+	dosfstools \
 	genisoimage \
 	git \
 	liblzma-dev \

README.md

@@ -53,13 +53,13 @@ See [netboot.xyz](https://netboot.xyz) for all documentation.  Some links to get
 
 If you'd like to contribute to the documentation, the netboot.xyz documenation is located at [netboot.xyz-docs](https://github.com/netbootxyz/netboot.xyz-docs).
 
-# Self Hosting netboot.xyz
+### Self Hosting netboot.xyz
 
 For those users who want to deploy their own netboot.xyz environment, you can leverage
 the same scripts that are used to deploy the hosted environment. The source scripts are
 all ansible templates and can be generated and customized to your preference.
 
-## With Ansible
+#### With Ansible
 
 To generate, run:
 
@@ -69,7 +69,7 @@ ansible-playbook -i inventory site.yml
 
 The build output will be located in /var/www/html by default.
 
-## With Docker
+#### With Docker
 
 ```
 docker build -t localbuild -f Dockerfile-build .
@@ -78,7 +78,7 @@ docker run --rm -it -v $(pwd):/buildout localbuild
 
 The build output will be in the generated folder `buildout`
 
-## Local Overides
+#### Local Overides
 
 Ansible will handle source generation as well as ipxe disk generation with your settings.  The disk generation was worked on a while back so it needs work to catch it up to the existing state of netboot.xyz.
 
@@ -86,13 +86,13 @@ If you want to override the defaults, you can put overrides in user_overrides.ym
 
 Also note many user customizations are located in the boot.cfg file for the IPXE menus. A high level of customization can be achieved using our stock build output and hosting this along with the menus locally. 
 
-## Self Hosted Custom Options
+#### Self Hosted Custom Options
 
 In addition to being able to host netboot.xyz locally, you can also create your own custom templates for custom menus within netboot.xyz.  Please see [Custom User Menus](etc/netbootxyz/custom/README.md) for more information.
 
-## What Operating Systems are currently available on netboot.xyz?
+### What Operating Systems are currently available on netboot.xyz?
 
-### Operating Systems
+#### Operating Systems
 
 | Name       | URL             | Installer Kernel | Live OS       |
 |------------|-----------------|------------------|---------------|
@@ -144,5 +144,4 @@ In addition to being able to host netboot.xyz locally, you can also create your
 
 ### Feedback
 
-Feel free to open up an [issue](https://github.com/netbootxyz/netboot.xyz/issues) on Github, swing by [Freenode IRC](http://freenode.net/) in the [#netbootxyz](http://webchat.freenode.net/?channels=#netbootxyz) channel, or ping us on [Discord](https://discord.gg/An6PA2a).  Follow us on [Twitter](https://twitter.com/netbootxyz) or like us on [Facebook](https://www.facebook.com/netboot.xyz)!
-
+Feel free to open up an [issue](https://github.com/netbootxyz/netboot.xyz/issues) on Github or ping us on [Discord](https://discord.gg/An6PA2a).  Follow us on [Twitter](https://twitter.com/netbootxyz) and like us on [Facebook](https://www.facebook.com/netboot.xyz)!

roles/netbootxyz/tasks/generate_checksums.yml

@@ -2,10 +2,14 @@
   - name: Register a listing of all created iPXE bootloaders
     command: ls -I checksums.txt {{ netbootxyz_root }}/ipxe/
     register: netboot_disks
+    tags:
+      - skip_ansible_lint
 
   - name: Generate date
     command: date
     register: current_date
+    tags:
+      - skip_ansible_lint
 
   - name: Gather stat listing of directory
     command: sha256sum -b {{ item }}
@@ -14,6 +18,8 @@
     args:
       chdir: "{{ netbootxyz_root }}/ipxe/"
     register: netboot_disks_stat
+    tags:
+      - skip_ansible_lint
 
   - name: Generate ipxe disk checksums
     template:

roles/netbootxyz/tasks/generate_disks_base.yml

@@ -45,7 +45,7 @@
       version: "{{ ipxe_branch }}"
       force: true
     register: ipxe_git_checkout
-      
+
   - name: Copy iPXE Bootloader template to iPXE source directory
     template:
       src: "disks/{{ bootloader_filename }}.j2"

roles/netbootxyz/tasks/generate_disks_efi.yml

@@ -58,7 +58,7 @@
       warn: false
     tags:
     - skip_ansible_lint
- 
+
   - name: Copy iPXE EFI builds to http directory
     copy:
       src: "{{ ipxe_source_dir }}/src/{{ item.src }}"

roles/netbootxyz/tasks/generate_signatures.yml

@@ -2,6 +2,8 @@
   - name: Gather list of source files
     command: ls {{ netbootxyz_root }}
     register: source_files
+    tags:
+      - skip_ansible_lint
 
   - name: Create directories for signatures
     file:
@@ -12,7 +14,7 @@
 
   - name: Generate signatures for source files
     shell: |
-      openssl cms -sign -binary -noattr -in {{ netbootxyz_root }}/{{ item }} \ 
+      openssl cms -sign -binary -noattr -in {{ netbootxyz_root }}/{{ item }} \
       -signer {{ codesign_cert_location }} -inkey {{ codesign_key_location }} -certfile {{ cert_file_location }} -outform DER \
       -out {{ sigs_dir }}/{{ item }}.sig
     args:

roles/netbootxyz/templates/menu/utils-efi.ipxe.j2

@@ -53,7 +53,7 @@ goto utils_exit
 :nbxyz-custom
 echo EXPERIMENTAL
 echo 
-echo Make sure you have a fork of https://github.com/antonym/netboot.xyz-custom.
+echo Make sure you have a fork of https://github.com/netbootxyz/netboot.xyz-custom.
 echo You can then customize your fork as needed and set up your own custom options.
 echo Once your username is set, a custom option will appear on the main menu.
 echo

roles/netbootxyz/templates/menu/utils-pcbios.ipxe.j2

@@ -53,7 +53,7 @@ goto utils_exit
 :nbxyz-custom
 echo EXPERIMENTAL
 echo 
-echo Make sure you have a fork of https://github.com/antonym/netboot.xyz-custom.
+echo Make sure you have a fork of https://github.com/netbootxyz/netboot.xyz-custom.
 echo You can then customize your fork as needed and set up your own custom options.
 echo Once your username is set, a custom option will appear on the main menu.
 echo

version.txt

@@ -1 +1 @@
-1.9.7
+1.9.8