Skip to content
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

Move README contents to official documentation #11

Merged
merged 3 commits into from
Jun 18, 2018
Merged

Move README contents to official documentation #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
348c261
Move README contents to official documentation
Jun 16, 2018
cac63b5
Update README filename in rpm_spec/*.spec.in
Jun 17, 2018
189a2d8
Update README filename in FORMULA.dom0
Jun 18, 2018
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
2 changes: 1 addition & 1 deletion FORMULA.dom0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 4.0.12
release: 1
name: virtual-machines-formula
top_level_dir: qvm
formula-files: README.rst LICENSE qvm
formula-files: README.md LICENSE qvm
pillar-files: pillar/qvm
formula_dir: $(MGMT_DEFAULT_FORMULA_DIR)/$(MGMT_SALTENV)/$(MGMT_NAME)
pillar_dir: $(MGMT_DEFAULT_PILLAR_DIR)/$(MGMT_SALTENV)/$(MGMT_TOP_LEVEL_DIR)
Expand Down
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Virtual Machine Formulae
========================

Downloads, installs and, configures VMs. Uses pillar data to define
default VM names and configuration details. For more information,
including a list of available states, please see the full documentation:

https://www.qubes-os.org/doc/salt/#virtual-machine-formulae
99 changes: 0 additions & 99 deletions README.rst
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions rpm_spec/qubes-mgmt-salt-dom0-virtual-machines-dom0.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ fi

%files
%defattr(-,root,root)
%doc LICENSE README.rst
%doc LICENSE README.md
%attr(750, root, root) %dir /srv/formulas/base/virtual-machines-formula
/srv/formulas/base/virtual-machines-formula/README.rst
/srv/formulas/base/virtual-machines-formula/README.md
/srv/formulas/base/virtual-machines-formula/LICENSE
/srv/formulas/base/virtual-machines-formula/qvm/anon-whonix.sls
/srv/formulas/base/virtual-machines-formula/qvm/anon-whonix.top
Expand Down