Differential D606

fix problems with openqa_data in Docker
ClosedPublic
Actions

Authored by garretraziel on Oct 1 2015, 2:57 PM.

Details

Reviewers
adamwill
jskladan
Commits
rOPENQA55e05fb14a1e: fix problems with openqa_data in Docker
Summary

These are actually two commits, but these are small changes on ~same place
so I put them into one DR.

First change is in Dockerfile - it removes unnecessary argument from package installation.
Second change is in set_openid script - it used sed and it hadn't escaped variable properly,
so I had to change it to AWK.
Third change is in config file - it sets httpsonly to 0, so we could use it locally via http
(to overcome problems with self-signed certificate).

Test Plan

build docker image, run set_openid script

Diff Detail

Repository
rOPENQA fedora_openqa
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
garretraziel retitled this revision from to fix problems with openqa_data in Docker.Oct 1 2015, 2:57 PM
garretraziel updated this object.
garretraziel edited the test plan for this revision. (Show Details)
garretraziel added reviewers: jskladan, adamwill.
jskladan accepted this revision.Oct 2 2015, 10:06 AM

K whatev'...

This revision is now accepted and ready to land.Oct 2 2015, 10:06 AM
Closed by commit rOPENQA55e05fb14a1e: fix problems with openqa_data in Docker (authored by garretraziel). · Explain WhyOct 2 2015, 11:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1580

View Options

docker/openqa_data/data.template/conf/openqa.ini

Show All 28 Lines
29#if you use another file, remember the apparmor profile! 29​#if you use another file, remember the apparmor profile!
30file = /var/log/openqa 30​file = /var/log/openqa
31#level = debug|info|warn|error|fatal 31​#level = debug|info|warn|error|fatal
32 32​
33[openid] 33​[openid]
34## base url for openid provider 34​## base url for openid provider
35provider = https://id.fedoraproject.org/ 35​provider = https://id.fedoraproject.org/
36## enforce redirect back to https 36​## enforce redirect back to https
37#httpsonly = 1 37​httpsonly = 0
View Options

docker/openqa_data/scripts/set_openid

1#!/bin/bash 1​#!/bin/bash
2 2​
3echo OpenID provider: 3​echo OpenID provider:
4read OPENID 4​read OPENID
5 5​
6sed "s/provider =.*/provider = $OPENID/" -i /data/conf/openqa.ini 6​awk -v openid="$OPENID" '
7​/^provider/ {$0 = "provider = " openid}
8​{print}
9​' /data/conf/openqa.ini > /tmp/openqa.ini.new
10​mv /tmp/openqa.ini.new /data/conf/openqa.ini
7 11​
8echo "The file now contains:" 12​echo "The file now contains:"
9cat /data/conf/openqa.ini 13​cat /data/conf/openqa.ini