Excellent sir!
That is great information.
I started with the steps on:
https://fedorahosted.org/scap-security-guide/wiki/becomeadeveloper
The steps in the “Establishing your Accounts” section seemed a little misleading, which
led to the confusion.
Step 3 seemed to indicate that I needed to request access. Then the link included for that
step led to a 404 error.
If I were to have skipped those on to the last section, I would have finally derived at
the reference you indicated “SSG on GitHub Primer”.
Hopefully, I got it all down at this point.
Thanks again everyone!
Best regards,
Trey Henefield, CISSP
Senior IAVA Engineer
Ultra Electronics
Advanced Tactical Systems, Inc.
4101 Smith School Road
Building IV, Suite 100
Austin, TX 78744 USA
Trey.Henefield(a)ultra-ats.com
Tel: +1 512 327 6795 ext. 647
Fax: +1 512 327 8043
Mobile: +1 512 541 6450
www.ultra-ats.com
From: scap-security-guide-bounces(a)lists.fedorahosted.org
[mailto:scap-security-guide-bounces@lists.fedorahosted.org] On Behalf Of Shawn Wells
Sent: Wednesday, December 10, 2014 2:57 PM
To: scap-security-guide(a)lists.fedorahosted.org
Subject: Re: SCAP Content Submission ...
On 12/10/14, 3:35 PM, Shawn Wells wrote:
On 12/10/14, 11:40 AM, Trey Henefield wrote:
Ah, so I do need to fork then. No I was trying to create a branch on
the SSG repo. That was likely my problem.
You may find this helpful:
https://github.com/OpenSCAP/scap-security-guide/wiki/SSG-on-GitHub-Primer
Feedback is most appreciated on that process!
--
So, I played around with the code some. Here's what I did to get your code into the
GitHub style:
Quote notes...
* I extracted your code to /tmp/trey/
* My GitHub branch is /var/www/html/gh/scap-security-guide
#1: Branching
Within the zip file are a few new technologies, namely Firefox, Java, and Webmin. Each one
is worthy of it's own local development branch.
$ cd /var/www/html/gh/scap-security-guide/
$ git branch trey-firefox
$ git branch trey-java
$ git branch trey-webmin
To verify the branches were created:
$ git branch -a
* master
....
trey-firefox
trey-java
trey-webmin
.....
#2: "Import" the Firefox code
$ git checkout trey-firefox
$ git branch
master
shawndwells-disa-oct2014-release-diffs
* trey-firefox
trey-java
trey-webmin
$ mv /tmp/tray/Firefox/ .
$ git add Firefox/
$ git commit -a -m "initial commit of firefox content"
#3: "Import" the Java & Webmin code
To change branches, check them out, e.g.:
$ git checkout trey-java
To verify what branch you're in, type "git branch". You're working
branch will have an asterisk in front.
Once you're in the branch, import your content as in step #2 (mv the code in, git add,
git commit).
#4: Push to GitHub
We now need to push your local changes to GitHub. You'll need to do a special
formatted push for that:
$ git push origin trey-firefox
$ git push origin trey-java
$ git push origin trey-webmin
You'll see output similar to the following, though it'll only ask you for a
passphrase if you have one on your keypair:
$ git push origin trey-firefox
Enter passphrase for key '/home/shawnw/.ssh/id_rsa':
Counting objects: 85, done.
Compressing objects: 100% (81/81), done.
Writing objects: 100% (84/84), 66.26 KiB, done.
Total 84 (delta 41), reused 0 (delta 0)
To
git@github.com:shawndwells/scap-security-guide.git<mailto:git@github.com:shawndwells/scap-security-guide.git
* [new branch] trey-firefox -> trey-firefox
#5: Issue a pull request
Go to your github project page, and you'll now see PR buttons like the following:
[cid:image001.png@01D0148A.A6248D00]
Click "Compare & pull request," fill out the form (aka change description of
what you've done), and you're done!
We'll worry about how to incorporate feedback once the PRs are submitted. This is a
really fantastic contribution by the way. Especially on Java.... very few people have
tried to tackle this.
Disclaimer
The information contained in this communication from trey.henefield(a)ultra-ats.com sent at
2014-12-10 16:08:47 is confidential and may be legally privileged.
It is intended solely for use by scap-security-guide(a)lists.fedorahosted.org and others
authorized to receive it. If you are not scap-security-guide(a)lists.fedorahosted.org you
are hereby notified that
any disclosure, copying, distribution or taking action in reliance of the contents of this
information is strictly prohibited and may be unlawful.