diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml index e3ef2ca95..edee7af4d 100644 --- a/.github/workflows/ce-provision-publish-docs.yml +++ b/.github/workflows/ce-provision-publish-docs.yml @@ -3,13 +3,15 @@ name: Publish docs # Run this workflow on demand and every time a new commit pushed to your repository on: pull_request: +# branches: +# - 1.x +# - 2.x workflow_dispatch: jobs: # Set the job key. The key is displayed as the job name # when a job name is not provided public-docs: - if: ${{ github.event.pull_request.head.ref != 'documentation' }} # Name the Job name: Publish the ce-provision docs to GitHub # Set the type of machine to run on @@ -25,6 +27,11 @@ jobs: - name: Install wiki2pages run: /usr/bin/su - ce-dev -c "/usr/bin/git clone https://github.com/codeenigma/wikis2pages.git /home/ce-dev/build/wiki2pages" + - name: Update local applications + run: | + /usr/bin/su - ce-dev -c "cd /home/ce-dev/ce-provision && /usr/bin/git pull origin 2.x" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/ce-deploy && /usr/bin/git pull origin 1.x" + - name: Set up Ansible hosts file run: | mkdir -p /home/ce-dev/ansible/bin/hosts @@ -47,7 +54,11 @@ jobs: /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh init.sh --repo https://github.com/codeenigma/ce-provision.git --branch 2.x --no-ce-dev" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/provision.yml" /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /bin/sh set-current.sh --project ce-provision-2.x --no-ce-dev" - /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && /home/ce-dev/ansible/bin/ansible-playbook -e 'wiki2pages_build_path=/home/ce-dev/build/wiki2pages launch_hugo_server=false' -i /home/ce-dev/ansible/bin/hosts /home/ce-dev/build/wiki2pages/ce-dev/ansible/deploy.yml" + + - name: Run Hugo + run: | + /usr/bin/su - ce-dev -c "cd /home/ce-dev/build/wiki2pages && hugo" ls -la /home/ce-dev/build/wiki2pages/public/ce-provision-2.x/ - name: Publish documentation diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md index 3522de3bc..8e8a2e4bf 100644 --- a/docs/_Sidebar.md +++ b/docs/_Sidebar.md @@ -3,101 +3,101 @@ - [Install](/install) - [Usage](/scripts) - [Roles](roles) - - [AWS Infrastructure](/roles/aws) - - [AWS ACL](/roles/aws/aws_acl) - - [AWS Certificate Manager](/roles/aws/aws_acm) - - [AWS AMI ASG Cleanup](/roles/aws/aws_ami_asg_cleanup) - - [AWS AMI](/roles/aws/aws_ami) - - [AWS Backup](/roles/aws/aws_backup) - - [AWS Backup Validation](/roles/aws/aws_backup_validation) - - [AWS CloudFront distribution](/roles/aws/aws_cloudfront_distribution) - - [Cloudwatch log group](/roles/aws/aws_cloudwatch_log_group) - - [Amazon credentials](/roles/aws/aws_credentials) - - [Autoscale cluster](/roles/aws/aws_ec2_autoscale_cluster) - - [EC2 CloudWatch Metric Alarm](/roles/aws/aws_ec2_metric_alarm) - - [EC2 instance with EIP](/roles/aws/aws_ec2_with_eip) - - [AWS EFS](/roles/aws/aws_efs) - - [AWS ElastiCache](/roles/aws/aws_elasticache) - - [AWS IAM EC2](/roles/aws/aws_iam_role) - - [AWS IAM SAML](/roles/aws/aws_iam_saml) - - [AWS Network Info](/roles/aws/_aws_network_info) - - [AWS OpenSearch](/roles/aws/aws_opensearch) - - [AWS key pair.](/roles/aws/aws_provision_ec2_keypair) - - [AWS RDS](/roles/aws/aws_rds) - - [AWS Resource Group.](/roles/aws/aws_resource_group) - - [AWS S3 Bucket](/roles/aws/aws_s3_bucket) - - [AWS Security Groups](/roles/aws/aws_security_groups) - - [AWS SG/firewall role](/roles/aws/aws_sg_iptables) - - [AWS SNS](/roles/aws/aws_sns) - - [VPC](/roles/aws/aws_vpc) - - [Update main route for a given VPC](/roles/aws/aws_vpc_route) - - [VPC](/roles/aws/aws_vpc_subnet) - - [Contributed roles](/roles/contrib) - - [Debian Packages](/roles/debian) - - [Ansible Galaxy](/roles/debian/ansible_galaxy) - - [Ansible](/roles/debian/ansible) - - [APACHE](/roles/debian/apache) - - [Apparmor](/roles/debian/apparmor) - - [Extra packages](/roles/debian/apt_extra_packages) - - [APT Repository](/roles/debian/apt_repository) - - [APT Unattended Upgrades](/roles/debian/apt_unattended_upgrades) - - [AWS CLI](/roles/debian/aws_cli) - - [AWS Cloudwatch agent](/roles/debian/aws_cloudwatch_agent) - - [EFS client](/roles/debian/aws_efs_client) - - [AWS SSM agent](/roles/debian/aws_ssm_agent) - - [ce-deploy](/roles/debian/ce_deploy) - - [Extra packages](/roles/debian/ce_dev) - - [Automated patching](/roles/debian/ce_patcher) - - [ce-provision](/roles/debian/ce_provision) - - [ClamAV](/roles/debian/clamav) - - [Docker CE](/roles/debian/docker_ce) - - [Docker Registry](/roles/debian/docker_registry) - - [Duplicity](/roles/debian/duplicity) - - [Firewall Config](/roles/debian/firewall_config) - - [Frontail](/roles/debian/frontail) - - [Gitlab](/roles/debian/gitlab) - - [Gitlab Runner](/roles/debian/gitlab_runner) - - [GPG Key](/roles/debian/gpg_key) - - [HA Proxy](/roles/debian/haproxy) - - [Managed /etc/hosts](/roles/debian/hosts) - - [Jenkins](/roles/debian/jenkins) - - [Jitsi](/roles/debian/jitsi) - - [LDAP Server](/roles/debian/ldap_server) - - [LHCI](/roles/debian/lhci) - - [Mailpit](/roles/debian/mailpit) - - [Mount sync](/roles/debian/mount_sync) - - [MariaDB Client](/roles/debian/mysql_client) - - [MySQL Server - Oracle Community Edition](/roles/debian/mysql_server_oracle_ce) - - [NGINX](/roles/debian/nginx) - - [NodeJS](/roles/debian/nodejs) - - [OpenVPN](/roles/debian/openvpn) - - [Packer](/roles/debian/packer) - - [PAM LinOTP](/roles/debian/pam_linotp) - - [PHP terminal client](/roles/debian/php-cli) - - [PHP common components](/roles/debian/php-common) - - [PHP Composer](/roles/debian/php_composer) - - [PHP-FPM](/roles/debian/php-fpm) - - [phpMyAdmin](/roles/debian/phpmyadmin) - - [PHP XDebug](/roles/debian/php_xdebug) - - [Postfix](/roles/debian/postfix) - - [Process Manager](/roles/debian/process_manager) - - [Python Boto](/roles/debian/python_boto) - - [Python Common](/roles/debian/python_common) - - [Python Pip Packages](/roles/debian/python_pip_packages) - - [rkhunter](/roles/debian/rkhunter) - - [Rsyslog](/roles/debian/rsyslog) - - [solr](/roles/debian/solr) - - [SSHD](/roles/debian/ssh_server) - - [SSL](/roles/debian/ssl) - - [sudo config](/roles/debian/sudo_config) - - [Swap](/roles/debian/swap) - - [System](/roles/debian/system) - - [User Ansible](/roles/debian/user_ansible) - - [varnish_config](/roles/debian/varnish_config) - - [wazuh](/roles/debian/wazuh) - - [Init role](/roles/_init) - - ["Meta" roles that group individual roles together.](/roles/_meta) - - [AWS account](/roles/_meta/aws_account) - - [AWS client](/roles/_meta/aws_client_instance) - - [AWS region](/roles/_meta/aws_region) - - [\_overrides.](/roles/_overrides) + - [AWS Infrastructure](roles/aws) + - [AWS ACL](roles/aws/aws_acl) + - [AWS Certificate Manager](roles/aws/aws_acm) + - [AWS AMI ASG Cleanup](roles/aws/aws_ami_asg_cleanup) + - [AWS AMI](roles/aws/aws_ami) + - [AWS Backup](roles/aws/aws_backup) + - [AWS Backup Validation](roles/aws/aws_backup_validation) + - [AWS CloudFront distribution](roles/aws/aws_cloudfront_distribution) + - [Cloudwatch log group](roles/aws/aws_cloudwatch_log_group) + - [Amazon credentials](roles/aws/aws_credentials) + - [Autoscale cluster](roles/aws/aws_ec2_autoscale_cluster) + - [EC2 CloudWatch Metric Alarm](roles/aws/aws_ec2_metric_alarm) + - [EC2 instance with EIP](roles/aws/aws_ec2_with_eip) + - [AWS EFS](roles/aws/aws_efs) + - [AWS ElastiCache](roles/aws/aws_elasticache) + - [AWS IAM EC2](roles/aws/aws_iam_role) + - [AWS IAM SAML](roles/aws/aws_iam_saml) + - [AWS Network Info](roles/aws/_aws_network_info) + - [AWS OpenSearch](roles/aws/aws_opensearch) + - [AWS key pair.](roles/aws/aws_provision_ec2_keypair) + - [AWS RDS](roles/aws/aws_rds) + - [AWS Resource Group.](roles/aws/aws_resource_group) + - [AWS S3 Bucket](roles/aws/aws_s3_bucket) + - [AWS Security Groups](roles/aws/aws_security_groups) + - [AWS SG/firewall role](roles/aws/aws_sg_iptables) + - [AWS SNS](roles/aws/aws_sns) + - [VPC](roles/aws/aws_vpc) + - [Update main route for a given VPC](roles/aws/aws_vpc_route) + - [VPC](roles/aws/aws_vpc_subnet) + - [Contributed roles](roles/contrib) + - [Debian Packages](roles/debian) + - [Ansible Galaxy](roles/debian/ansible_galaxy) + - [Ansible](roles/debian/ansible) + - [APACHE](roles/debian/apache) + - [Apparmor](roles/debian/apparmor) + - [Extra packages](roles/debian/apt_extra_packages) + - [APT Repository](roles/debian/apt_repository) + - [APT Unattended Upgrades](roles/debian/apt_unattended_upgrades) + - [AWS CLI](roles/debian/aws_cli) + - [AWS Cloudwatch agent](roles/debian/aws_cloudwatch_agent) + - [EFS client](roles/debian/aws_efs_client) + - [AWS SSM agent](roles/debian/aws_ssm_agent) + - [ce-deploy](roles/debian/ce_deploy) + - [Extra packages](roles/debian/ce_dev) + - [Automated patching](roles/debian/ce_patcher) + - [ce-provision](roles/debian/ce_provision) + - [ClamAV](roles/debian/clamav) + - [Docker CE](roles/debian/docker_ce) + - [Docker Registry](roles/debian/docker_registry) + - [Duplicity](roles/debian/duplicity) + - [Firewall Config](roles/debian/firewall_config) + - [Frontail](roles/debian/frontail) + - [Gitlab](roles/debian/gitlab) + - [Gitlab Runner](roles/debian/gitlab_runner) + - [GPG Key](roles/debian/gpg_key) + - [HA Proxy](roles/debian/haproxy) + - [Managed /etc/hosts](roles/debian/hosts) + - [Jenkins](roles/debian/jenkins) + - [Jitsi](roles/debian/jitsi) + - [LDAP Server](roles/debian/ldap_server) + - [LHCI](roles/debian/lhci) + - [Mailpit](roles/debian/mailpit) + - [Mount sync](roles/debian/mount_sync) + - [MariaDB Client](roles/debian/mysql_client) + - [MySQL Server - Oracle Community Edition](roles/debian/mysql_server_oracle_ce) + - [NGINX](roles/debian/nginx) + - [NodeJS](roles/debian/nodejs) + - [OpenVPN](roles/debian/openvpn) + - [Packer](roles/debian/packer) + - [PAM LinOTP](roles/debian/pam_linotp) + - [PHP terminal client](roles/debian/php-cli) + - [PHP common components](roles/debian/php-common) + - [PHP Composer](roles/debian/php_composer) + - [PHP-FPM](roles/debian/php-fpm) + - [phpMyAdmin](roles/debian/phpmyadmin) + - [PHP XDebug](roles/debian/php_xdebug) + - [Postfix](roles/debian/postfix) + - [Process Manager](roles/debian/process_manager) + - [Python Boto](roles/debian/python_boto) + - [Python Common](roles/debian/python_common) + - [Python Pip Packages](roles/debian/python_pip_packages) + - [rkhunter](roles/debian/rkhunter) + - [Rsyslog](roles/debian/rsyslog) + - [solr](roles/debian/solr) + - [SSHD](roles/debian/ssh_server) + - [SSL](roles/debian/ssl) + - [sudo config](roles/debian/sudo_config) + - [Swap](roles/debian/swap) + - [System](roles/debian/system) + - [User Ansible](roles/debian/user_ansible) + - [varnish_config](roles/debian/varnish_config) + - [wazuh](roles/debian/wazuh) + - [Init role](roles/_init) + - ["Meta" roles that group individual roles together.](roles/_meta) + - [AWS account](roles/_meta/aws_account) + - [AWS client](roles/_meta/aws_client_instance) + - [AWS region](roles/_meta/aws_region) + - [\_overrides.](roles/_overrides) diff --git a/docs/roles/aws/aws_ec2_autoscale_cluster.md b/docs/roles/aws/aws_ec2_autoscale_cluster.md index a9b957ac3..1a030e1e5 100644 --- a/docs/roles/aws/aws_ec2_autoscale_cluster.md +++ b/docs/roles/aws/aws_ec2_autoscale_cluster.md @@ -4,7 +4,7 @@ Supports either AWS EC2 Autoscaling Groups (ASGs) or AWS ECS clusters. Note, thi * https://github.com/codeenigma/ce-deploy/tree/1.x/roles/deploy_code (EC2) Note also that the `deploy_code` role needs to be used in tandem with this `ce-provision` role, which ensures there is a `cloud-init` script in place to install the code in the event of an instance replacement: -* https://github.com/codeenigma/ce-provision/tree/1.x/roles/mount_sync +* https://github.com/codeenigma/ce-provision/tree/2.x/roles/debian/mount_sync ## Networking Regardless of the scenario, ECS or EC2, if you decide to use a private subnet instead of giving your instances or containers public IP addresses, you will need at least one NAT gateway (more than one for resilience). When you are creating NAT gateways they must be in a *public* subnet and your routing tables in the private subnets should use the NAT gateway as the default route. Do not put the NAT gateways on the private subnets, it cannot possibly work and your containers or instances will not have internet access. diff --git a/docs/roles/debian/nodejs.md b/docs/roles/debian/nodejs.md index c121efb58..0e4624ee1 100644 --- a/docs/roles/debian/nodejs.md +++ b/docs/roles/debian/nodejs.md @@ -8,7 +8,7 @@ Installs NodeJS from official repos. --- nodejs: # Used by apt_unattended_upgrades - apt_origin_nodejs: "origin=. nodistro,codename=nodistro,label=. nodistro" # nodejs repo + apt_origin_nodejs: "origin=Node Source,codename=nodistro,label=Node Source" # nodejs repo apt_signed_by_nodejs: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key apt_origin_yarn: "origin=yarn,codename=stable,label=yarn-stable" # yarn repo apt_signed_by_yarn: https://dl.yarnpkg.com/debian/pubkey.gpg diff --git a/roles/aws/aws_ec2_autoscale_cluster/README.md b/roles/aws/aws_ec2_autoscale_cluster/README.md index a9b957ac3..1a030e1e5 100644 --- a/roles/aws/aws_ec2_autoscale_cluster/README.md +++ b/roles/aws/aws_ec2_autoscale_cluster/README.md @@ -4,7 +4,7 @@ Supports either AWS EC2 Autoscaling Groups (ASGs) or AWS ECS clusters. Note, thi * https://github.com/codeenigma/ce-deploy/tree/1.x/roles/deploy_code (EC2) Note also that the `deploy_code` role needs to be used in tandem with this `ce-provision` role, which ensures there is a `cloud-init` script in place to install the code in the event of an instance replacement: -* https://github.com/codeenigma/ce-provision/tree/1.x/roles/mount_sync +* https://github.com/codeenigma/ce-provision/tree/2.x/roles/debian/mount_sync ## Networking Regardless of the scenario, ECS or EC2, if you decide to use a private subnet instead of giving your instances or containers public IP addresses, you will need at least one NAT gateway (more than one for resilience). When you are creating NAT gateways they must be in a *public* subnet and your routing tables in the private subnets should use the NAT gateway as the default route. Do not put the NAT gateways on the private subnets, it cannot possibly work and your containers or instances will not have internet access. diff --git a/roles/debian/nodejs/README.md b/roles/debian/nodejs/README.md index c121efb58..0e4624ee1 100644 --- a/roles/debian/nodejs/README.md +++ b/roles/debian/nodejs/README.md @@ -8,7 +8,7 @@ Installs NodeJS from official repos. --- nodejs: # Used by apt_unattended_upgrades - apt_origin_nodejs: "origin=. nodistro,codename=nodistro,label=. nodistro" # nodejs repo + apt_origin_nodejs: "origin=Node Source,codename=nodistro,label=Node Source" # nodejs repo apt_signed_by_nodejs: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key apt_origin_yarn: "origin=yarn,codename=stable,label=yarn-stable" # yarn repo apt_signed_by_yarn: https://dl.yarnpkg.com/debian/pubkey.gpg