diff --git a/dist/aws_credentials.example b/dist/aws_credentials.example new file mode 100644 index 00000000000..61e7c18b2df --- /dev/null +++ b/dist/aws_credentials.example @@ -0,0 +1,3 @@ +[default] +aws_access_key_id = ACCESS_KEY_ID +aws_secret_access_key = SECRET_ACCESS_KEY diff --git a/dist/obs-server.spec b/dist/obs-server.spec index 9aa9f91ec97..75f269a5c26 100644 --- a/dist/obs-server.spec +++ b/dist/obs-server.spec @@ -284,6 +284,7 @@ This package contains test cases for testing a installed appliances. %package -n obs-cloud-uploader Summary: The Open Build Service -- Image Cloud Uploader Requires: obs-server +Requires: aws-cli %if 0%{?suse_version} > 1315 Requires: python3-ec2uploadimg %else @@ -359,6 +360,8 @@ fi install -m 755 $RPM_BUILD_DIR/open-build-service-%version/dist/clouduploader.rb $RPM_BUILD_ROOT/%{_bindir}/clouduploader mkdir -p $RPM_BUILD_ROOT/etc/obs/cloudupload install -m 644 $RPM_BUILD_DIR/open-build-service-%version/dist/ec2utils.conf.example $RPM_BUILD_ROOT/etc/obs/cloudupload/.ec2utils.conf +mkdir -p $RPM_BUILD_ROOT/etc/obs/cloudupload/.aws +install -m 644 $RPM_BUILD_DIR/open-build-service-%version/dist/aws_credentials.example $RPM_BUILD_ROOT/etc/obs/cloudupload/.aws/credentials %check %if 0%{?disable_obs_test_suite} @@ -734,6 +737,8 @@ usermod -a -G docker obsservicerun %{_bindir}/clouduploader %dir /etc/obs %dir /etc/obs/cloudupload +%dir /etc/obs/cloudupload/.aws +%config(noreplace) /etc/obs/cloudupload/.aws/credentials %config(noreplace) /etc/obs/cloudupload/.ec2utils.conf %package -n obs-container-registry