diff --git a/opentofu/GNUmakefile b/opentofu/GNUmakefile new file mode 100644 index 0000000..f961584 --- /dev/null +++ b/opentofu/GNUmakefile @@ -0,0 +1,11 @@ +.PHONY: init +init: + tofu init -upgrade + +.PHONY: apply +apply: + tofu apply -auto-approve + +.PHONY: destroy +destroy: + tofu destroy -auto-approve diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yaml similarity index 100% rename from roles/common/defaults/main.yml rename to roles/common/defaults/main.yaml diff --git a/roles/common/meta/main.yml b/roles/common/meta/main.yaml similarity index 100% rename from roles/common/meta/main.yml rename to roles/common/meta/main.yaml diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yaml similarity index 100% rename from roles/common/tasks/main.yml rename to roles/common/tasks/main.yaml diff --git a/roles/common/tests/test.yml b/roles/common/tests/test.yaml similarity index 100% rename from roles/common/tests/test.yml rename to roles/common/tests/test.yaml diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yaml similarity index 100% rename from roles/common/vars/main.yml rename to roles/common/vars/main.yaml diff --git a/roles/koji-hub/defaults/main.yml b/roles/koji-hub/defaults/main.yaml similarity index 100% rename from roles/koji-hub/defaults/main.yml rename to roles/koji-hub/defaults/main.yaml diff --git a/roles/koji-hub/templates/hub.conf.j2 b/roles/koji-hub/templates/hub.conf.j2 index 89e58f1..3b0e0b2 100644 --- a/roles/koji-hub/templates/hub.conf.j2 +++ b/roles/koji-hub/templates/hub.conf.j2 @@ -22,4 +22,4 @@ Plugins = sigul_sign [sigul] # Sigul server URL (replace with actual Sigul server address) -SigulServer = http://localhost:8080/sigul +SigulServer = {{ sigul_server }} diff --git a/roles/kojid/defaults/main.yml b/roles/kojid/defaults/main.yaml similarity index 100% rename from roles/kojid/defaults/main.yml rename to roles/kojid/defaults/main.yaml diff --git a/roles/kojid/handlers/main.yml b/roles/kojid/handlers/main.yaml similarity index 100% rename from roles/kojid/handlers/main.yml rename to roles/kojid/handlers/main.yaml diff --git a/roles/kojid/meta/main.yml b/roles/kojid/meta/main.yaml similarity index 100% rename from roles/kojid/meta/main.yml rename to roles/kojid/meta/main.yaml diff --git a/roles/kojid/tasks/main.yml b/roles/kojid/tasks/main.yaml similarity index 100% rename from roles/kojid/tasks/main.yml rename to roles/kojid/tasks/main.yaml diff --git a/roles/kojid/tests/test.yml b/roles/kojid/tests/test.yaml similarity index 100% rename from roles/kojid/tests/test.yml rename to roles/kojid/tests/test.yaml diff --git a/roles/kojid/vars/main.yml b/roles/kojid/vars/main.yaml similarity index 100% rename from roles/kojid/vars/main.yml rename to roles/kojid/vars/main.yaml diff --git a/roles/kojira/defaults/main.yml b/roles/kojira/defaults/main.yaml similarity index 100% rename from roles/kojira/defaults/main.yml rename to roles/kojira/defaults/main.yaml diff --git a/roles/kojira/handlers/main.yml b/roles/kojira/handlers/main.yaml similarity index 100% rename from roles/kojira/handlers/main.yml rename to roles/kojira/handlers/main.yaml diff --git a/roles/kojira/meta/main.yml b/roles/kojira/meta/main.yaml similarity index 100% rename from roles/kojira/meta/main.yml rename to roles/kojira/meta/main.yaml diff --git a/roles/kojira/tasks/main.yml b/roles/kojira/tasks/main.yaml similarity index 100% rename from roles/kojira/tasks/main.yml rename to roles/kojira/tasks/main.yaml diff --git a/roles/kojira/tests/test.yml b/roles/kojira/tests/test.yaml similarity index 100% rename from roles/kojira/tests/test.yml rename to roles/kojira/tests/test.yaml diff --git a/roles/kojira/vars/main.yml b/roles/kojira/vars/main.yaml similarity index 100% rename from roles/kojira/vars/main.yml rename to roles/kojira/vars/main.yaml diff --git a/roles/nfs-client/meta/main.yaml b/roles/nfs-client/meta/main.yaml index 263339e..ecd0edd 100644 --- a/roles/nfs-client/meta/main.yaml +++ b/roles/nfs-client/meta/main.yaml @@ -1,5 +1,5 @@ ---- #SPDX-License-Identifier: MIT-0 +--- galaxy_info: author: your name description: your role description diff --git a/roles/nfs-client/meta/main.yml b/roles/nfs-client/meta/main.yml deleted file mode 100644 index ecd0edd..0000000 --- a/roles/nfs-client/meta/main.yml +++ /dev/null @@ -1,36 +0,0 @@ -#SPDX-License-Identifier: MIT-0 ---- -galaxy_info: - author: your name - description: your role description - company: your company (optional) - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) - - min_ansible_version: 2.1 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/vars/default.yaml b/vars/default.yaml index de9690f..20e66ad 100644 --- a/vars/default.yaml +++ b/vars/default.yaml @@ -10,6 +10,7 @@ koji_profile: koji kojid_fqdn: cs10-koji-03.mx-os koji_db_host: cs10-koji-01.mx-os koji_nfs_host: cs10-koji-02.mx-os +sigul_server: http://localhost:8080/sigul # Paths & Directories koji_top_dir: /mnt/koji @@ -85,8 +86,8 @@ kojid_allowed_scms: git.mx-os.mx:/MxOS/rpms/* kojid_allowed_scms_use_config: true kojid_allowed_scms_use_policy: false kojid_smtp_host: mail.mx-os.mx -kojid_smtp_user: kojid@cd10-koji-03.mx-os -kojid_from_addr: Koji Build System +kojid_smtp_user: kojid@cs10-koji-03.mx-os +kojid_from_addr: Koji Build System # HTTPD/Web Paths httpd_ssl_config_file: /etc/httpd/conf.d/ssl.conf