diff --git a/.config b/.config deleted file mode 100644 index f22f8b1b..00000000 --- a/.config +++ /dev/null @@ -1,8 +0,0 @@ -celery_broker: sqla+sqlite:////tmp/celery.db -celery_backend: db+sqlite:////tmp/celery.db -solar_db: sqlite:////tmp/solar.db -# solar_db: postgresql:///postgres:password@10.0.0.2:5432/solardb -# solar_db: riak://10.0.0.2:8087 -riak_ensemble: False -lock_bucket_type: '' -counters_bucket_type: '' diff --git a/etc/solar/solar.yaml.sample b/etc/solar/solar.yaml.sample new file mode 100644 index 00000000..73c9a21b --- /dev/null +++ b/etc/solar/solar.yaml.sample @@ -0,0 +1,10 @@ +--- +celery_backend: "db+sqlite:////tmp/celery.db" +celery_broker: "sqla+sqlite:////tmp/celery.db" +counters_bucket_type: "" +lock_bucket_type: "" +riak_ensemble: false +# solar_db: "sqlite:////tmp/solar.db" +# Example: +# solar_db: "postgresql:///postgres:password@10.0.0.2:5432/solardb" +# solar_db: "riak://10.0.0.2:8087" diff --git a/specs/solar.spec b/specs/solar.spec index 08b1512b..d9596526 100644 --- a/specs/solar.spec +++ b/specs/solar.spec @@ -56,9 +56,11 @@ cd %{_builddir}/%{name}-%{version} && PBR_VERSION=%{version} python setup.py bui %install cd %{_builddir}/%{name}-%{version} && PBR_VERSION=%{version} python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/INSTALLED_FILES +install -p -D -m 644 %{_builddir}/%{name}-%{version}/etc/solar/solar.yaml.sample %{buildroot}%{_sysconfdir}/solar/solar.yaml %clean rm -rf $RPM_BUILD_ROOT %files -f %{_builddir}/%{name}-%{version}/INSTALLED_FILES +%config(noreplace) %{_sysconfdir}/solar/solar.yaml.sample