Skip to content

wget files into their own cache dir. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CarlFK wants to merge 7 commits into
base: master
Choose a base branch
from
Open

wget files into their own cache dir. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e4ef88f
wget files into their own cache dir.
CarlFK Jul 23, 2017
34bef41
Merge branch 'bm-urls' of github.com:CarlFK/video-stack-deploy into m…
CarlFK Aug 1, 2017
5db1fd2
Add and document more_appends.
CarlFK Aug 1, 2017
9babdf3
use a subshell to cd around in the script.
CarlFK Aug 1, 2017
cc38e3e
fix some #comments
CarlFK Aug 1, 2017
dafbafe
Don't restart systemd-journald in the installer, it errors and aborts.
CarlFK Aug 11, 2017
c261c12
parameterize publisher entity.
CarlFK Aug 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions roles/system-software/handlers/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
- name: restart systemd-journald
command: systemctl restart systemd-journald
when: ansible_connection != 'local'
8 changes: 7 additions & 1 deletion roles/veyepar-secrets/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
user_name: videoteam

# Dir that contains workin veyepar checkout with secrets in place
# like on a developer's laptop
# like on a developer's laptop,
# best to pass this on the command line:
# --extra-vars="{'veyepar_confs': '/home/carl/src/veyepar'}"
# veyepar_confs: /home/carl/src/veyepar

# Entity that produces and uploads, like DebConf Video Team, or NDV.
# used for credits image and upload credentials
publisher: dcvt
6 changes: 3 additions & 3 deletions roles/veyepar-secrets/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
with_items:
- dj/dj/local_settings.py # db pw, smtp
- dj/scripts/pw.py # conf site, twitter, swift ...
- dj/scripts/client_secrets.json # youtube
# - dj/scripts/oauth2-{{ org }}.json # youtube (not really needed?)
- dj/scripts/client_secrets.json # youtube app keys (for veyepar?)
- dj/scripts/bling/{{ org }}/ # secret title.svg :p
- dj/scripts/bling/ndv-169.png
- dj/scripts/bling/{{ publisher }}-169.png # credits slide
- dj/scripts/oauth2-{{ publisher }}.json # youtube credentials
when: veyepar_confs is defined
4 changes: 2 additions & 2 deletions scripts/d-i/stretch/preseed.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Ansible managed
#### Contents of the preconfiguration file (for jessie)
#### Contents of the preconfiguration file (for stretch)

### Localization
# Preseeding only locale sets language, country and locale.
d-i debian-installer/locale string en_US
Expand Down
3 changes: 3 additions & 0 deletions scripts/mk_usb_installer.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ playbook_branch=master
inventory_repo=
inventory_branch=

# Anything else you want to append to the kernel.
more_appends=

# where to get installer binaries:

suite=stretch
Expand Down
12 changes: 10 additions & 2 deletions scripts/mk_usb_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,16 @@ lc/playbook_repo=${playbook_repo} \\
lc/playbook_branch=${playbook_branch} \\
lc/inventory_repo=${inventory_repo} \\
lc/inventory_branch=${inventory_branch} \\
${more_appends} \\
Copy link
Collaborator

@stefanor stefanor Jul 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not in the provided config

Copy link
Owner Author

@CarlFK CarlFK Aug 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

"

appends="${preseed} partman-auto/disk=${disk} grub-installer/bootdev=${bootdev} hostname=${hostname} domain=${domain} hw-detect/load_firmware=${load_firmware} lc/playbook_repo=${playbook_repo} lc/playbook_branch=${playbook_branch} lc/inventory_repo=${inventory_repo} lc/inventory_branch=${inventory_branch} "

cache=cache/${suite}
mkdir -p ${cache}

(cd ${cache}

# get and veriy the boot image
# (hd-media dir because that is bunred into the SHA256SUMS file)
wget -N --directory-prefix hd-media ${bootimg_loc}/hd-media/boot.img.gz
Expand All @@ -41,7 +47,9 @@ curl -OJ ${iso_loc}/SHA256SUMS
grep ${iso} SHA256SUMS > ${iso}.SHA256SUM
sha256sum --check ${iso}.SHA256SUM

zcat hd-media/boot.img.gz|sudo dcfldd of=/dev/${dev}
)

zcat ${cache}/hd-media/boot.img.gz|sudo dcfldd of=/dev/${dev}
# or good ol dd
# zcat boot.img.gz|sudo dd of=/dev/${dev} conv=fdatasync

Expand All @@ -68,7 +76,7 @@ case $suite in

*)

cp ${iso} ${iso}.SHA256SUM /media/${dev}
cp ${cache}/${iso} ${cache}/${iso}.SHA256SUM /media/${dev}
cd /media/${dev}
# check the iso image again, make sure it copied ok.
sha256sum --check ${iso}.SHA256SUM
Expand Down